diff --git a/debian/changelog b/debian/changelog
index 52bd7a8..02568bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager (0.6.6-3.1~1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * remove BEGIN INFO output from resolv.conf, solves etckeeper problem
+
+ -- Stefan Voelkel <stefan@bc-bd.org>  Sat, 31 Oct 2009 10:59:50 +0000
+
 network-manager (0.6.6-3) unstable; urgency=low
 
   * debian/network-manager.network-manager-dispatcher.init 
diff --git a/debian/patches/30-remove_info.patch b/debian/patches/30-remove_info.patch
new file mode 100644
index 0000000..4d4d37a
--- /dev/null
+++ b/debian/patches/30-remove_info.patch
@@ -0,0 +1,22 @@
+diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c
+index c445ef3..dbb78e7 100644
+--- a/src/named-manager/nm-named-manager.c
++++ b/src/named-manager/nm-named-manager.c
+@@ -368,17 +368,6 @@ rewrite_resolv_conf (NMNamedManager *mgr, NMIP4Config *config, GError **error)
+ 	if ((f = fopen (tmp_resolv_conf, "w")) == NULL)
+ 		goto lose;
+ 
+-	if (fprintf (f, "### BEGIN INFO\n#\n") < 0)
+-		goto lose;
+-	if (fprintf (f, "# Modified_by:  NetworkManager\n") < 0)
+-		goto lose;
+-	if (fprintf (f, "# Process:      /usr/bin/NetworkManager\n") < 0)
+-		goto lose;
+-	if (fprintf (f, "# Process_id:   %d\n", getpid ()) < 0)
+-		goto lose;
+-	if (fprintf (f, "#\n### END INFO\n\n") < 0)
+-		goto lose;
+-
+ 	/* If the ip4 config is a secondary config and has no nameservers, use the
+ 	 * nameservers from the primary config.
+ 	 */