diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 324dcbdf2714fa4e3ed2430671009a0a4ea7b755..ba507a3d6a95d66620dc48e91e1918d3b718dd0e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package homer_mapnav_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.2 (2016-11-03)
+------------------
+
 0.1.1 (2016-11-03)
 ------------------
 * fixes
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index f8f59c334afd5e08c928e48b7282944819a80784..0000000000000000000000000000000000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,9 +0,0 @@
-ros-kinetic-homer-mapnav-msgs (0.1.1-0xenial) xenial; urgency=high
-
-  * fixes
-  * initial commit
-  * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
-
-
diff --git a/debian/changelog.em b/debian/changelog.em
new file mode 100644
index 0000000000000000000000000000000000000000..f288616383fe8f4543f2eb312541c6588cb3d96c
--- /dev/null
+++ b/debian/changelog.em
@@ -0,0 +1,7 @@
+@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)-@(DebianInc)@(Distribution)) @(Distribution); urgency=high
+
+@(changelog)
+
+ -- @(main_name) <@(main_email)>  @(change_date)
+
+@[end for]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f11c82a4cb6cc2e8f3bdf52b5cdeaad4d5bb214e..0000000000000000000000000000000000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
\ No newline at end of file
diff --git a/debian/compat.em b/debian/compat.em
new file mode 100644
index 0000000000000000000000000000000000000000..b7f8528bffbd06395de8fb99042c25b1448f311a
--- /dev/null
+++ b/debian/compat.em
@@ -0,0 +1 @@
+@(debhelper_version)
\ No newline at end of file
diff --git a/debian/control b/debian/control
deleted file mode 100644
index ecb5c3da37af4d22cd6c95a28d6251531cafd6a1..0000000000000000000000000000000000000000
--- a/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: ros-kinetic-homer-mapnav-msgs
-Section: misc
-Priority: extra
-Maintainer: Viktor Seib <vseib@uni-koblenz.de>
-Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-genmsg, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs
-Homepage: 
-Standards-Version: 3.9.2
-
-Package: ros-kinetic-homer-mapnav-msgs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs
-Description: homer_mapnav_msgs contains the messages used for mapping and navigation
diff --git a/debian/control.em b/debian/control.em
new file mode 100644
index 0000000000000000000000000000000000000000..7cbf65a6a90b7b5f71439e8067643e802e54f540
--- /dev/null
+++ b/debian/control.em
@@ -0,0 +1,14 @@
+Source: @(Package)
+Section: misc
+Priority: extra
+Maintainer: @(Maintainer)
+Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends))
+Homepage: @(Homepage)
+Standards-Version: 3.9.2
+
+Package: @(Package)
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
+@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
+@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
+Description: @(Description)
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index f5ad783aa853cb7e166a93bae57c363ba2671875..0000000000000000000000000000000000000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[git-buildpackage]
-upstream-tag=release/kinetic/homer_mapnav_msgs/0.1.1-0
-upstream-tree=tag
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
new file mode 100644
index 0000000000000000000000000000000000000000..ad24a164d06a7971a9dcca990e935fea39b6ce88
--- /dev/null
+++ b/debian/gbp.conf.em
@@ -0,0 +1,3 @@
+[git-buildpackage]
+upstream-tag=@(release_tag)
+upstream-tree=tag
diff --git a/debian/rules b/debian/rules.em
similarity index 76%
rename from debian/rules
rename to debian/rules.em
index c380387654441534f62d8a3779858b368c7ec7ea..991c991b8775b882ef271fcac740ace8675e7538 100755
--- a/debian/rules
+++ b/debian/rules.em
@@ -14,29 +14,29 @@ export DH_OPTIONS=-v --buildsystem=cmake
 #  https://code.ros.org/trac/ros/ticket/2977
 #  https://code.ros.org/trac/ros/ticket/3842
 export LDFLAGS=
-export PKG_CONFIG_PATH=/opt/ros/kinetic/lib/pkgconfig
+export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig
 # Explicitly enable -DNDEBUG, see:
 # 	https://github.com/ros-infrastructure/bloom/issues/327
 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG
 
 %:
-	dh  $@
+	dh  $@@
 
 override_dh_auto_configure:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_configure -- \
 		-DCATKIN_BUILD_BINARY_PACKAGE="1" \
-		-DCMAKE_INSTALL_PREFIX="/opt/ros/kinetic" \
-		-DCMAKE_PREFIX_PATH="/opt/ros/kinetic"
+		-DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
+		-DCMAKE_PREFIX_PATH="@(InstallationPrefix)"
 
 override_dh_auto_build:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_build
 
 override_dh_auto_test:
@@ -44,19 +44,19 @@ override_dh_auto_test:
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 	echo -- Running tests. Even if one of them fails the build is not canceled.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_test || true
 
 override_dh_shlibdeps:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
-	dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-homer-mapnav-msgs//opt/ros/kinetic/lib/
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
+	dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/
 
 override_dh_auto_install:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_install
diff --git a/package.xml b/package.xml
index f1c2ef8aba24d698f0c8139ebddd28525eb71298..e9f55c1caebd25c25bda7499104e1c4975224cc7 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>homer_mapnav_msgs</name>
-  <version>0.1.1</version>
+  <version>0.1.2</version>
   <description> homer_mapnav_msgs contains the messages used for mapping and navigation
   </description>
   <maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>