diff -u hnb-1.9.18/debian/control hnb-1.9.18/debian/control
--- hnb-1.9.18/debian/control
+++ hnb-1.9.18/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Carsten Hey <carsten@debian.org>
 Uploaders: Axel Beckert <abe@debian.org>
 Build-Depends: debhelper (>= 7), libncursesw5-dev, quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://hnb.sourceforge.net/
 
 Package: hnb
diff -u hnb-1.9.18/debian/rules hnb-1.9.18/debian/rules
--- hnb-1.9.18/debian/rules
+++ hnb-1.9.18/debian/rules
@@ -8,6 +8,7 @@
 include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -15,7 +16,10 @@
 endif
 export CFLAGS
 
-build: build-stamp
+.PHONY: build build-indep build-arch
+build: build-indep build-arch
+build-indep:
+build-arch: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(MAKE) --always-make src/hnbrc.inc
@@ -24,6 +28,7 @@
 	$(MAKE) --always-make -C doc Documentation.html
 	touch $@
 
+.PHONY: clean
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -31,6 +36,7 @@
 	$(MAKE) clean
 	dh_clean build-stamp
 
+.PHONY: install
 install: build
 	dh_testdir
 	dh_testroot
@@ -38,6 +44,8 @@
 	dh_installdirs
 	install -m0755 src/hnb $(CURDIR)/debian/hnb/usr/bin
 
+.PHONY: binary binary-indep binary-arch
+binary: binary-indep binary-arch
 binary-indep:
 binary-arch: build install
 	dh_testdir
@@ -60,2 +67,0 @@
-binary: binary-indep binary-arch
-.PHONY: build clean mostlyclean binary-indep binary-arch binary install
diff -u hnb-1.9.18/debian/changelog hnb-1.9.18/debian/changelog
--- hnb-1.9.18/debian/changelog
+++ hnb-1.9.18/debian/changelog
@@ -1,3 +1,12 @@
+hnb (1.9.18-9) unstable; urgency=low
+
+  * Mark node as not temporary when finishing an edit.  Merged from lhnb.
+    (Patch 24, Closes: #574118)
+  * Bump standards version to 3.9.2.
+  * Add the targets binary-indep and binary-arch to debian/rules.
+
+ -- Carsten Hey <carsten@debian.org>  Mon, 29 Aug 2011 16:06:20 +0200
+
 hnb (1.9.18-8) unstable; urgency=low
 
   [ Carsten Hey ]
diff -u hnb-1.9.18/debian/patches/series hnb-1.9.18/debian/patches/series
--- hnb-1.9.18/debian/patches/series
+++ hnb-1.9.18/debian/patches/series
@@ -22,2 +22,3 @@
 23_fix_spelling_errors_in_man_page.patch
+24_mark_node_as_not_temporary.patch
 50_debian_use_sensible-browser_instead_of_w3m.patch
only in patch2:
unchanged:
--- hnb-1.9.18.orig/debian/patches/24_mark_node_as_not_temporary.patch
+++ hnb-1.9.18/debian/patches/24_mark_node_as_not_temporary.patch
@@ -0,0 +1,19 @@
+hnb (1.9.18-9)
+
+commit 5a1585ae74aabd6e08f1b55e3d587630049f2779
+Author: Tomas Janousek <tomi@nomi.cz>
+Date:   Tue May 31 21:01:02 2011 +0200
+
+    Mark node as not temporary when finishing an edit.
+
+--- hnb-1.9.18.orig/src/ui_edit.c
++++ hnb-1.9.18/src/ui_edit.c
+@@ -142,6 +142,8 @@ static void* ui_edit_cmd (int argc, char
+ 			case ui_action_confirm:
+ 				input[strlen (input) - 1] = 0;
+ 				node_set (pos, TEXT, input);
++				if (node_getflag (pos, F_temp))
++					node_setflag (pos, F_temp, 0);
+ 				stop = 1;
+ 				docmd(pos, "tree_changed");  
+ 				break;