diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7095b9..57947ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,20 @@ set(danbooru_client_VERSION_PATCH 0)
 
 set (danbooru_VERSION ${danbooru_client_VERSION_MAJOR}.${danbooru_client_VERSION_MINOR}.${danbooru_client_VERSION_PATCH})
 
+set(CPACK_PACKAGE_VERSION_MAJOR "${danbooru_client_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${danbooru_client_VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${danbooru_client_VERSION_PATCH}")
+set(CPACK_SOURCE_GENERATOR "TXZ")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+  "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+set(CPACK_SOURCE_IGNORE_FILES
+  "/build/;/.bzr/;~$;/.git/;${CPACK_SOURCE_IGNORE_FILES}")
+include(CPack)
+
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
 find_package (ECM REQUIRED NO_MODULE)
+
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 set(REQUIRED_QT_VERSION "5.4.0")
@@ -36,22 +49,17 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
              Wallet             # Password handling
              Declarative        # QML
              I18n               # i18n
+             FileMetaData       # Tagging
              # DocTools           # Disabled until manual's ready
              )
 
-# Not a framework yet, hence separate
-find_package(KF5 "5.7.0" COMPONENTS
-            FileMetaData)
-
 include(ECMInstallIcons)
 include(KDEInstallDirs)
 include(KDECompilerSettings)
 include(KDECMakeSettings)
 include(FeatureSummary)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set_package_properties(FileMetaData PROPERTIES TYPE OPTIONAL PURPOSE "Required for file tagging")
 
 # add_subdirectory( doc )
 add_subdirectory( src )