diff --git a/CMakeLists.txt b/CMakeLists.txt
index de0b08a7a..88f73944c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,7 @@ endif (NOT APPLE)
 add_subdirectory(3rdparty/universalchardet)
 add_subdirectory(tests)
 add_subdirectory(dist)
+add_subdirectory(debian)
 
 if (WIN32 OR APPLE)
   message(STATUS "Building static qsqlite plugin")
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 11c56fb13..29a953237 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,7 +1,4 @@
 # Change this file when releasing a new version.
-# You'll also need to add a new changelog entry in:
-#   debian/changelog
-#   dist/clementine.spec.in
 
 # Version numbers.  For m.n rc, use m.(n-1).99
 set(CLEMENTINE_VERSION_MAJOR 0)
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
new file mode 100644
index 000000000..22edd201d
--- /dev/null
+++ b/debian/CMakeLists.txt
@@ -0,0 +1,5 @@
+execute_process(COMMAND date "+%a, %-d %b %Y %H:%M:%S %z"
+                OUTPUT_VARIABLE DEB_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/changelog.in
+               ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index cdee1f294..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,41 +0,0 @@
-clementine (0.3.90) unstable; urgency=low
-
-  * Development build
-
- -- David Sansome <me@davidsansome.com>  Mon, 7 Jun 2010 00:00:00 -0800
-
-clementine (0.3) unstable; urgency=low
-
-  * Version 0.3
-
- -- David Sansome <me@davidsansome.com>  Thu, 6 May 2010 00:00:00 -0800
-
-clementine (0.2.99) unstable; urgency=low
-
-  * Version 0.3 RC 1
-
- -- David Sansome <me@davidsansome.com>  Mon, 29 Apr 2010 00:00:00 -0800
-
-clementine (0.2) unstable; urgency=low
-
-  * Version 0.2
-
- -- David Sansome <me@davidsansome.com>  Mon, 22 Mar 2010 00:00:00 -0800
-
-clementine (0.1-6) unstable; urgency=low
-
-  * Add dependency on libqt4-sql-sqlite
-
- -- David Sansome <me@davidsansome.com>  Tue, 23 Feb 2010 06:22:53 -0800
-
-clementine (0.1-5) unstable; urgency=low
-
-  * Various bugfixes
-
- -- David Sansome <me@davidsansome.com>  Sun, 21 Feb 2010 22:55:00 -0800
-
-clementine (0.1-1) unstable; urgency=low
-
-  * Initial release
-
- -- David Sansome <me@davidsansome.com>  Mon, 18 Jan 2010 11:16:00 -0800
diff --git a/debian/changelog.in b/debian/changelog.in
new file mode 100644
index 000000000..b7713a628
--- /dev/null
+++ b/debian/changelog.in
@@ -0,0 +1,5 @@
+clementine (${CLEMENTINE_VERSION}) unstable; urgency=low
+
+  * Version ${CLEMENTINE_VERSION_STRING}
+
+ -- David Sansome <me@davidsansome.com>  ${DEB_DATE}
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index 4e7749e56..2f3770c6a 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -1,3 +1,6 @@
+execute_process(COMMAND date "+%a %b %Y"
+                OUTPUT_VARIABLE RPM_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/clementine.spec.in
                ${CMAKE_CURRENT_SOURCE_DIR}/clementine.spec)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in
index a5f9da85e..0c0310f8f 100644
--- a/dist/clementine.spec.in
+++ b/dist/clementine.spec.in
@@ -52,17 +52,5 @@ make clean
 %{_datadir}/clementine/projectm-presets
 
 %changelog
-* Thu May 6 2010 David Sansome <me@davidsansome.com> - 0.3
-- Version 0.3
-
-* Thu Apr 29 2010 David Sansome <me@davidsansome.com> - 0.2.99
-- Version 0.3 rc 1
-
-* Mon Mar 22 2010 David Sansome <me@davidsansome.com> - 0.2
-- Version 0.2
-
-* Sun Feb 21 2010 David Sansome <me@davidsansome.com> - 0.1-5
-- Various last-minute bugfixes
-
-* Sun Jan 17 2010 David Sansome <me@davidsansome.com> - 0.1-1
-- Initial package
+* ${RPM_DATE} David Sansome <me@davidsansome.com> - ${CLEMENTINE_VERSION}
+- Version ${CLEMENTINE_VERSION_STRING}