diff -Nru etckeeper-1.18.1ubuntu2/debian/changelog etckeeper-1.18.1ubuntu3/debian/changelog
--- etckeeper-1.18.1ubuntu2/debian/changelog	2015-12-01 19:45:53.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/debian/changelog	2016-01-10 22:02:21.000000000 +0000
@@ -1,3 +1,10 @@
+etckeeper (1.18.1ubuntu3) xenial; urgency=medium
+
+  * properly merge preinst and postinst to fix initial commit on 
+    fresh install, LP: #1532615
+
+ -- Nobuto Murata <nobuto@ubuntu.com>  Mon, 11 Jan 2016 07:02:16 +0900
+
 etckeeper (1.18.1ubuntu2) xenial; urgency=medium
 
   * Remove etckeeper delta for defaulting LANG to UTF8 - this appears to
diff -Nru etckeeper-1.18.1ubuntu2/debian/etckeeper.postinst etckeeper-1.18.1ubuntu3/debian/etckeeper.postinst
--- etckeeper-1.18.1ubuntu2/debian/etckeeper.postinst	2015-12-01 16:53:10.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/debian/etckeeper.postinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]; then
-	if [ -f /run/etckeeper/VCS ]; then
-		VCS=`cat /run/etckeeper/VCS`
-		sed -i 's/^VCS=/#VCS=/' /etc/etckeeper/etckeeper.conf
-		echo "VCS=$VCS" >> /etc/etckeeper/etckeeper.conf
-	fi
-fi
-
-exit 0
diff -Nru etckeeper-1.18.1ubuntu2/debian/etckeeper.preinst etckeeper-1.18.1ubuntu3/debian/etckeeper.preinst
--- etckeeper-1.18.1ubuntu2/debian/etckeeper.preinst	2015-12-01 17:49:02.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/debian/etckeeper.preinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-check_for_vcs() {
-	[ ! -f /etc/etckeeper/etckeeper.conf ] && return
-
-	. /etc/etckeeper/etckeeper.conf
-	[ -z "$VCS" ] && return
-	[ "${VCS}" != "bzr" ] && return
-	mkdir -p /run/etckeeper
-	echo $VCS > /run/etckeeper/VCS
-}
-
-case "${1}" in
-	upgrade)
-		rm -f /run/etckeeper/VCS
-		if [ -n "${2}" ] &&  dpkg --compare-versions "${2}" lt 1.18.1ubuntu1; then
-			( check_for_vcs )
-		fi
-		;;
-
-	install|abort-upgrade)
-
-		;;
-
-	*)
-		echo "preinst called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff -Nru etckeeper-1.18.1ubuntu2/debian/postinst etckeeper-1.18.1ubuntu3/debian/postinst
--- etckeeper-1.18.1ubuntu2/debian/postinst	2015-12-01 16:53:10.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/debian/postinst	2016-01-10 21:57:54.000000000 +0000
@@ -77,6 +77,17 @@
 		rm -f /etc/etckeeper/commit.d/40git-rm.dpkg-dist
 	fi
 
+	# do not change the default vcs if it etckeeper was already
+	# installed. This is only needed because we are changing the default
+	# (Ubuntu used to default to bzr). If admin hasn't changed anything,
+	# dpkg tries to be smart and update to the new default. This can be
+	# removed in 16.10.
+	if [ -f /run/etckeeper/VCS ]; then
+		VCS=`cat /run/etckeeper/VCS`
+		sed -i 's/^VCS=/#VCS=/' /etc/etckeeper/etckeeper.conf
+		echo "VCS=$VCS" >> /etc/etckeeper/etckeeper.conf
+	fi
+
 	if [ "$2" = "" ] && [ -e "/etc/etckeeper/etckeeper.conf" ]; then
 		# Fresh install.
 		. /etc/etckeeper/etckeeper.conf || true
diff -Nru etckeeper-1.18.1ubuntu2/debian/preinst etckeeper-1.18.1ubuntu3/debian/preinst
--- etckeeper-1.18.1ubuntu2/debian/preinst	2014-10-16 22:21:27.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/debian/preinst	2016-01-10 21:58:56.000000000 +0000
@@ -36,6 +36,16 @@
 	fi
 }
 
+check_for_vcs() {
+	[ ! -f /etc/etckeeper/etckeeper.conf ] && return
+
+	. /etc/etckeeper/etckeeper.conf
+	[ -z "$VCS" ] && return
+	[ "${VCS}" != "bzr" ] && return
+	mkdir -p /run/etckeeper
+	echo $VCS > /run/etckeeper/VCS
+}
+
 case "$1" in
 install|upgrade)
 	if dpkg --compare-versions "$2" le "0.7"; then
@@ -78,6 +88,16 @@
 		rm_conffile etckeeper "/etc/etckeeper/commit.d/40git-rm"
 	fi
 
+	# do not change the default vcs if it etckeeper was already
+	# installed. This is only needed because we are changing the default
+	# (Ubuntu used to default to bzr). If admin hasn't changed anything,
+	# dpkg tries to be smart and update to the new default. This can be
+	# removed in 16.10.
+	rm -f /run/etckeeper/VCS
+	if [ -n "$2" ] &&  dpkg --compare-versions "$2" lt "1.18.1ubuntu1"; then
+		( check_for_vcs )
+	fi
+
 	# delete files the prerm stashes away to handle purging
 	rm -rf /var/cache/etckeeper/stash
 esac
diff -Nru etckeeper-1.18.1ubuntu2/etckeeper etckeeper-1.18.1ubuntu3/etckeeper
--- etckeeper-1.18.1ubuntu2/etckeeper	2015-12-01 19:45:55.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/etckeeper	2016-01-10 22:02:27.000000000 +0000
@@ -66,7 +66,7 @@
 	exit 0
 elif [ "x$1" = "x-v" ] || [ "x$1" = "x--version" ]; then
 	# This is automatically updated by the Makefile.
-        echo "Version: 1.18.1ubuntu2"
+        echo "Version: 1.18.1ubuntu3"
         exit 0
 fi
 command="$1"
diff -Nru etckeeper-1.18.1ubuntu2/etckeeper.spec etckeeper-1.18.1ubuntu3/etckeeper.spec
--- etckeeper-1.18.1ubuntu2/etckeeper.spec	2015-12-01 19:45:55.000000000 +0000
+++ etckeeper-1.18.1ubuntu3/etckeeper.spec	2016-01-10 22:02:27.000000000 +0000
@@ -1,5 +1,5 @@
 Name: etckeeper
-Version: 1.18.1ubuntu2
+Version: 1.18.1ubuntu3
 Release: 4%{?dist}
 Summary: store /etc in git, mercurial, bzr or darcs