diff --git a/education/khangman/Makefile b/education/khangman/Makefile
index ca1f3cb91b2..1d46ef11e5a 100644
--- a/education/khangman/Makefile
+++ b/education/khangman/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/10/27 15:56:44 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2001/11/27 02:51:03 kevlo Exp $
 
 COMMENT=	"classical hangman game"
 
-DISTNAME=	khangman-0.7
+DISTNAME=	khangman-0.71
 CATEGORIES=	education
 NEED_VERSION=	1.484
 
@@ -17,7 +17,8 @@ PERMIT_DISTFILES_FTP=  Yes
 
 MASTER_SITES=	${HOMEPAGE}
 
-BUILD_DEPENDS=	::x11/qt2-designer
+BUILD_DEPENDS=	::x11/qt2-designer \
+		::devel/automake
 
 LIB_DEPENDS=	kdecore.3,DCOP,kdeui::x11/kde/libs2
 
@@ -28,7 +29,7 @@ MAKE_ENV=	${CONFIGURE_ENV}
 MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
 
 USE_X11=	Yes
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
 CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
diff --git a/education/khangman/distinfo b/education/khangman/distinfo
new file mode 100644
index 00000000000..8b3199d6a3f
--- /dev/null
+++ b/education/khangman/distinfo
@@ -0,0 +1,3 @@
+MD5 (khangman-0.71.tar.gz) = 90799a9729d0de440b11aaec8228c301
+RMD160 (khangman-0.71.tar.gz) = bb469ac0e296aef6db2ddf2363b70f549e1dad88
+SHA1 (khangman-0.71.tar.gz) = 2040273e86b0078670c0de523dc31f92af730dba
diff --git a/education/khangman/files/md5 b/education/khangman/files/md5
deleted file mode 100644
index c4382fc4046..00000000000
--- a/education/khangman/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (khangman-0.7.tar.gz) = 0200af9df5dee3254a59816092e7b3c2
-RMD160 (khangman-0.7.tar.gz) = 834b35f97a492b5f89238fc27fe456f7ab501440
-SHA1 (khangman-0.7.tar.gz) = e778738985f02b22dcf5efacb52c35fd9dd9b94d
diff --git a/education/khangman/patches/patch-khangman_Makefile_am b/education/khangman/patches/patch-khangman_Makefile_am
new file mode 100644
index 00000000000..0f8caf85656
--- /dev/null
+++ b/education/khangman/patches/patch-khangman_Makefile_am
@@ -0,0 +1,27 @@
+--- khangman/Makefile.am.orig	Wed Oct 31 15:05:50 2001
++++ khangman/Makefile.am	Mon Nov 26 18:00:56 2001
+@@ -3,17 +3,17 @@
+ khangman_SOURCES = khsplash.cpp khangman.cpp main.cpp 
+ khangman_LDADD   =  $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lX11 $(LIBSOCKET)
+ 
+-SUBDIRS = data sounds pics 
++SUBDIRS = data pics sounds
+ 
+ EXTRA_DIST = main.cpp khangman.cpp khangman.h khangman.desktop lo32-app-khangman.png lo16-app-khangman.png khsplash.cpp khsplash.h 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $$(kde_appsdir)/Applications/
+-	$(INSTALL_DATA) $(srcdir)/khangman.desktop $$(kde_appsdir)/Applications/khangman.desktop
+-	$(mkinstalldirs) $$(kde_icondir)/locolor/32x32/apps/
+-	$(INSTALL_DATA) $(srcdir)/lo32-app-khangman.png $$(kde_icondir)/locolor/32x32/apps/khangman.png
+-	$(mkinstalldirs) $$(kde_icondir)/locolor/16x16/apps/
+-	$(INSTALL_DATA) $(srcdir)/lo16-app-khangman.png $$(kde_icondir)/locolor/16x16/apps/khangman.png
++	$(mkinstalldirs) $(kde_appsdir)/Applications/
++	$(INSTALL_DATA) $(srcdir)/khangman.desktop $(DESTDIR)$(kde_appsdir)/Applications/khangman.desktop
++	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
++	$(INSTALL_DATA) $(srcdir)/lo32-app-khangman.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/khangman.png
++	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
++	$(INSTALL_DATA) $(srcdir)/lo16-app-khangman.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/khangman.png
+ 
+ uninstall-local:
+ 	-rm -f $$(kde_appsdir)/Applications/khangman.desktop
diff --git a/education/khangman/patches/patch-khangman_data_Makefile_am b/education/khangman/patches/patch-khangman_data_Makefile_am
new file mode 100644
index 00000000000..e25a44f46e5
--- /dev/null
+++ b/education/khangman/patches/patch-khangman_data_Makefile_am
@@ -0,0 +1,25 @@
+--- khangman/data/Makefile.am.orig	Wed Oct 31 15:05:50 2001
++++ khangman/data/Makefile.am	Mon Nov 26 16:44:13 2001
+@@ -4,14 +4,14 @@
+ EXTRA_DIST = easy.txt level2.txt level3.txt level4.txt 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/data/
+-	$(INSTALL_DATA) $(srcdir)/easy.txt $$(kde_datadir)/khangman/data/easy.txt
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/data/
+-	$(INSTALL_DATA) $(srcdir)/level2.txt $$(kde_datadir)/khangman/data/level2.txt
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/data/
+-	$(INSTALL_DATA) $(srcdir)/level3.txt $$(kde_datadir)/khangman/data/level3.txt
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/data/
+-	$(INSTALL_DATA) $(srcdir)/level4.txt $$(kde_datadir)/khangman/data/level4.txt
++	$(mkinstalldirs) $(kde_datadir)/khangman/data/
++	$(INSTALL_DATA) $(srcdir)/easy.txt $(DESTDIR)$(kde_datadir)/khangman/data/easy.txt
++	$(mkinstalldirs) $(kde_datadir)/khangman/data/
++	$(INSTALL_DATA) $(srcdir)/level2.txt $(DESTDIR)$(kde_datadir)/khangman/data/level2.txt
++	$(mkinstalldirs) $(kde_datadir)/khangman/data/
++	$(INSTALL_DATA) $(srcdir)/level3.txt $(DESTDIR)$(kde_datadir)/khangman/data/level3.txt
++	$(mkinstalldirs) $(kde_datadir)/khangman/data/
++	$(INSTALL_DATA) $(srcdir)/level4.txt $(DESTDIR)$(kde_datadir)/khangman/data/level4.txt
+ 
+ uninstall-local:
+ 	-rm -f $$(kde_datadir)/khangman/data/easy.txt
diff --git a/education/khangman/patches/patch-khangman_pics_Makefile_am b/education/khangman/patches/patch-khangman_pics_Makefile_am
new file mode 100644
index 00000000000..ecb5569ba89
--- /dev/null
+++ b/education/khangman/patches/patch-khangman_pics_Makefile_am
@@ -0,0 +1,65 @@
+--- khangman/pics/Makefile.am.orig	Mon Nov 26 17:58:52 2001
++++ khangman/pics/Makefile.am	Mon Nov 26 18:00:06 2001
+@@ -4,34 +4,34 @@
+ EXTRA_DIST = hg1.jpg hg10.jpg hg12.jpg hg13.jpg hg14.jpg hg2.jpg hg3.jpg hg4.jpg hg5.jpg hg6.jpg hg7.jpg hg8.jpg hg9.jpg khm_splash.png 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg1.jpg $$(kde_datadir)/khangman/pics/hg1.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg10.jpg $$(kde_datadir)/khangman/pics/hg10.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg12.jpg $$(kde_datadir)/khangman/pics/hg12.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg13.jpg $$(kde_datadir)/khangman/pics/hg13.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg14.jpg $$(kde_datadir)/khangman/pics/hg14.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg2.jpg $$(kde_datadir)/khangman/pics/hg2.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg3.jpg $$(kde_datadir)/khangman/pics/hg3.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg4.jpg $$(kde_datadir)/khangman/pics/hg4.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg5.jpg $$(kde_datadir)/khangman/pics/hg5.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg6.jpg $$(kde_datadir)/khangman/pics/hg6.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg7.jpg $$(kde_datadir)/khangman/pics/hg7.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg8.jpg $$(kde_datadir)/khangman/pics/hg8.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/hg9.jpg $$(kde_datadir)/khangman/pics/hg9.jpg
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/pics/
+-	$(INSTALL_DATA) $(srcdir)/khm_splash.png $$(kde_datadir)/khangman/pics/khm_splash.png
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg1.jpg $(kde_datadir)/khangman/pics/hg1.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg10.jpg $(kde_datadir)/khangman/pics/hg10.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg12.jpg $(kde_datadir)/khangman/pics/hg12.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg13.jpg $(kde_datadir)/khangman/pics/hg13.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg14.jpg $(kde_datadir)/khangman/pics/hg14.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg2.jpg $(kde_datadir)/khangman/pics/hg2.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg3.jpg $(kde_datadir)/khangman/pics/hg3.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg4.jpg $(kde_datadir)/khangman/pics/hg4.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg5.jpg $(kde_datadir)/khangman/pics/hg5.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg6.jpg $(kde_datadir)/khangman/pics/hg6.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg7.jpg $(kde_datadir)/khangman/pics/hg7.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg8.jpg $(kde_datadir)/khangman/pics/hg8.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/hg9.jpg $(kde_datadir)/khangman/pics/hg9.jpg
++	$(mkinstalldirs) $(kde_datadir)/khangman/pics/
++	$(INSTALL_DATA) $(srcdir)/khm_splash.png $(kde_datadir)/khangman/pics/khm_splash.png
+ 
+ uninstall-local:
+ 	-rm -f $$(kde_datadir)/khangman/pics/hg1.jpg
diff --git a/education/khangman/patches/patch-khangman_sounds_Makefile_am b/education/khangman/patches/patch-khangman_sounds_Makefile_am
new file mode 100644
index 00000000000..70fc90e7b1f
--- /dev/null
+++ b/education/khangman/patches/patch-khangman_sounds_Makefile_am
@@ -0,0 +1,17 @@
+--- khangman/sounds/Makefile.am.orig	Wed Oct 31 15:05:50 2001
++++ khangman/sounds/Makefile.am	Mon Nov 26 16:50:21 2001
+@@ -4,10 +4,10 @@
+ EXTRA_DIST = new_game.wav splash.wav 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/sounds/
+-	$(INSTALL_DATA) $(srcdir)/new_game.wav $$(kde_datadir)/khangman/sounds/new_game.wav
+-	$(mkinstalldirs) $$(kde_datadir)/khangman/sounds/
+-	$(INSTALL_DATA) $(srcdir)/splash.wav $$(kde_datadir)/khangman/sounds/splash.wav
++	$(mkinstalldirs) $(kde_datadir)/khangman/sounds/
++	$(INSTALL_DATA) $(srcdir)/new_game.wav $(DESTDIR)$(kde_datadir)/khangman/sounds/new_game.wav
++	$(mkinstalldirs) $(kde_datadir)/khangman/sounds/
++	$(INSTALL_DATA) $(srcdir)/splash.wav $(DESTDIR)$(kde_datadir)/khangman/sounds/splash.wav
+ 
+ uninstall-local:
+ 	-rm -f $$(kde_datadir)/khangman/sounds/new_game.wav
diff --git a/education/khangman/pkg/PLIST b/education/khangman/pkg/PLIST
index dee64c262d1..f724cd79aa6 100644
--- a/education/khangman/pkg/PLIST
+++ b/education/khangman/pkg/PLIST
@@ -1,24 +1,23 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/10/27 15:56:44 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.2 2001/11/27 02:51:09 kevlo Exp $
 bin/khangman
 share/applnk/Applications/khangman.desktop
-share/apps/khangman/easy.txt
-share/apps/khangman/level2.txt
-share/apps/khangman/level3.txt
-share/apps/khangman/level4.txt
-share/apps/khangman/pics/hg1.gif
-share/apps/khangman/pics/hg10.gif
-share/apps/khangman/pics/hg12.gif
-share/apps/khangman/pics/hg13.gif
-share/apps/khangman/pics/hg14.gif
-share/apps/khangman/pics/hg2.gif
-share/apps/khangman/pics/hg3.gif
-share/apps/khangman/pics/hg4.gif
-share/apps/khangman/pics/hg5.gif
-share/apps/khangman/pics/hg6.gif
-share/apps/khangman/pics/hg7.gif
-share/apps/khangman/pics/hg8.gif
-share/apps/khangman/pics/hg9.gif
-share/apps/khangman/pics/kh_sm.png
+share/apps/khangman/data/easy.txt
+share/apps/khangman/data/level2.txt
+share/apps/khangman/data/level3.txt
+share/apps/khangman/data/level4.txt
+share/apps/khangman/pics/hg1.jpg
+share/apps/khangman/pics/hg10.jpg
+share/apps/khangman/pics/hg12.jpg
+share/apps/khangman/pics/hg13.jpg
+share/apps/khangman/pics/hg14.jpg
+share/apps/khangman/pics/hg2.jpg
+share/apps/khangman/pics/hg3.jpg
+share/apps/khangman/pics/hg4.jpg
+share/apps/khangman/pics/hg5.jpg
+share/apps/khangman/pics/hg6.jpg
+share/apps/khangman/pics/hg7.jpg
+share/apps/khangman/pics/hg8.jpg
+share/apps/khangman/pics/hg9.jpg
 share/apps/khangman/pics/khm_splash.png
 share/apps/khangman/sounds/new_game.wav
 share/apps/khangman/sounds/splash.wav
@@ -26,4 +25,5 @@ share/icons/locolor/16x16/apps/khangman.png
 share/icons/locolor/32x32/apps/khangman.png
 @dirrm share/apps/khangman/sounds
 @dirrm share/apps/khangman/pics
+@dirrm share/apps/khangman/data
 @dirrm share/apps/khangman