diff --git a/CMakeLists.txt b/CMakeLists.txt
index 026691d..2d4febf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ option(USE_GCONF_BACKEND "Detect and use gconf backend if available." OFF)
 option(USE_CAMERA_SUPPORT "Detect and use camera support if available." ON)
 option(USE_NLS "Build Native Language Support (using gettext)" ON)
 option(USE_FLICKR "Enable Flickr support" ON)
+option(USE_500PX "Enable 500px export support" ON)
 option(USE_KWALLET "Build kwallet password storage backend" ON)
 option(USE_GNOME_KEYRING "Build gnome-keyring password storage backend" ON)
 option(USE_UNITY "Use libunity to report progress in the launcher" OFF)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 16fc0da..d76f9b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -157,6 +157,15 @@ if(USE_FLICKR)
   endif(FLICKCURL_FOUND)
 endif(USE_FLICKR)

+if(USE_500PX)
+  find_package(OAuth)
+  if(OAuth_FOUND)
+    include_directories(${OAuth_INCLUDE_DIRS})
+    list(APPEND LIBS ${OAuth_LIBRARIES})
+    add_definitions(${OAuth_DEFINITIONS})
+  endif(OAuth_FOUND)
+endif(USE_500PX)

index c602c3e..511e276 100644
--- a/src/imageio/storage/CMakeLists.txt
+++ b/src/imageio/storage/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.6)
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/../../" "${CMAKE_CURRENT_SOURCE_DIR}")
 set(MODULES disk picasa email gallery)

+if(OAuth_FOUND)
+       list(APPEND MODULES fhpx)
+endif(OAuth_FOUND)
+
 if(FLICKCURL_FOUND)
        list(APPEND MODULES flickr)
 endif(FLICKCURL_FOUND)