diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3afd4521..bee3e36a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,12 +406,15 @@ endif()
 #
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm)
-    install(FILES res/synergy.svg DESTINATION share/icons)
+    configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/deb ${CMAKE_BINARY_DIR}/debian)
+
     if("${VERSION_MAJOR}" STREQUAL "2") 
         install(FILES res/synergy2.desktop DESTINATION share/applications)
     else()
         install(FILES res/synergy.desktop DESTINATION share/applications)
     endif()
+
+    install(FILES res/synergy.svg DESTINATION share/icons)
 endif()
 
 else()
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index aba1da70..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-synergy (1.9.0~beta1) UNRELEASED; urgency=medium
-
-  * Initial release.
-
- -- Symless Ltd <engineering@symless.com>  Thu, 27 Apr 2017 13:50:32 +0000
diff --git a/dist/deb/changelog.in b/dist/deb/changelog.in
new file mode 100644
index 00000000..008253f2
--- /dev/null
+++ b/dist/deb/changelog.in
@@ -0,0 +1,5 @@
+synergy (@SYNERGY_VERSION@~@SYNERGY_VERSION_STAGE@) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Symless Ltd <engineering@symless.com>  @SYNERGY_RELEASE_DATE@
diff --git a/debian/compat b/dist/deb/compat
similarity index 100%
rename from debian/compat
rename to dist/deb/compat
diff --git a/debian/control b/dist/deb/control
similarity index 100%
rename from debian/control
rename to dist/deb/control
diff --git a/debian/copyright b/dist/deb/copyright
similarity index 100%
rename from debian/copyright
rename to dist/deb/copyright
diff --git a/debian/rules b/dist/deb/rules
similarity index 100%
rename from debian/rules
rename to dist/deb/rules
diff --git a/debian/source/format b/dist/deb/source/format
similarity index 100%
rename from debian/source/format
rename to dist/deb/source/format