diff --git a/debian/control b/debian/control
index 26a78ee..d592f94 100644
--- a/debian/control
+++ b/debian/control
@@ -1,47 +1,47 @@
 Source: sylkserver
 Section: net
 Priority: optional
 Maintainer: Dan Pascu <dan@ag-projects.com>
 Uploaders: Adrian Georgescu <ag@ag-projects.com>
-Build-Depends: debhelper (>= 11), dh-python, python-all (>= 2.7)
+Build-Depends: debhelper (>= 11), dh-python, python-all (>= 2.7), rename
 Standards-Version: 3.9.8
 
 Package: sylkserver
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends},
          lsb-base,
          python-application (>= 2.5.0),
          python-autobahn,
          python-eventlib,
          python-klein,
          python-lxml,
          python-sipsimple (>= 3.0.0),
          python-twisted,
          python-typing
 Suggests: libavahi-compat-libdnssd1, python-wokkel, sylkserver-webrtc-gateway
 Recommends: sylkserver-sounds
 Description: Extensible real-time-communications application server
  SylkServer is a SIP applications server that provides applications like
  echo, playback and conference, as well as act as a gateway between SIP
  and IRC, XMPP and WEBRTC.
 
 Package: sylkserver-sounds
 Architecture: all
 Depends: ${misc:Depends}, sylkserver
 Description: Extensible real-time-communications application server sounds
  SylkServer is a SIP applications server that provides applications like
  echo, playback and conference, as well as act as a gateway between SIP
  and IRC, XMPP and WEBRTC.
  .
  This package contains sounds used by SylkServer.
 
 Package: sylkserver-webrtc-gateway
 Architecture: all
 Depends: ${misc:Depends}, sylkserver, janus
 Description: Extensible real-time-communications application server WebRTC gateway
  SylkServer is a SIP applications server that provides applications like
  echo, playback and conference, as well as act as a gateway between SIP
  and IRC, XMPP and WEBRTC.
  .
  This is a meta-package containing the dependencies required to run the
  WebRTC gateway application.
diff --git a/debian/rules b/debian/rules
index 8580bdc..1576cb7 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,15 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
 
 %:
 	dh $@ --with python2
 
+override_dh_install:
+	# Move samples to configuration files in the debian package
+	rename 's/\.sample$$//' debian/tmp/etc/sylkserver/*.sample
+	dh_install
+
 override_dh_clean:
 	dh_clean
 	rm -rf build dist MANIFEST