diff --git a/games/angband/Makefile b/games/angband/Makefile
index ae8fd14086d..ffb9b4154c2 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2005/03/07 21:01:22 niallo Exp $
+# $OpenBSD: Makefile,v 1.14 2005/11/03 17:01:05 niallo Exp $
 # Original from: Robert Ruehlmann
 
 COMMENT=		"rogue-like game with X11 support"
 COMMENT-no_x11=		"rogue-like game"
 
-DISTNAME=		angband-3.0.5
+DISTNAME=		angband-3.0.6
 CATEGORIES=     	games
 
 HOMEPAGE=		http://thangorodrim.angband.org/
diff --git a/games/angband/distinfo b/games/angband/distinfo
index 1f7aad88b62..0902d74e243 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1,4 +1,4 @@
-MD5 (angband-3.0.5.tar.gz) = cc61e55baf4ffdcf9bfc6caa14935ec0
-RMD160 (angband-3.0.5.tar.gz) = f22ac3b1e1b109be803c2712f8ba23b605b97eca
-SHA1 (angband-3.0.5.tar.gz) = 80841e97d92837ed0a279c4c9edb686c74fd32a0
-SIZE (angband-3.0.5.tar.gz) = 1496319
+MD5 (angband-3.0.6.tar.gz) = 4c31b1b3679dff20db6a5fcb182c3e96
+RMD160 (angband-3.0.6.tar.gz) = 16f2f907ed501bbb1c645d54a677a05684256b8a
+SHA1 (angband-3.0.6.tar.gz) = 53f61670f31e30ea7491933f42beacdd1fd6201c
+SIZE (angband-3.0.6.tar.gz) = 1570831
diff --git a/games/angband/patches/patch-src_init2_c b/games/angband/patches/patch-src_init2_c
index dfd87c01a16..47063bfa143 100644
--- a/games/angband/patches/patch-src_init2_c
+++ b/games/angband/patches/patch-src_init2_c
@@ -1,32 +1,27 @@
---- src/init2.c	2005/02/24 20:54:51	1.1
-+++ src/init2.c	2005/02/24 20:56:56
-@@ -135,12 +135,10 @@
- 	/*** Build the sub-directory names ***/
+$OpenBSD: patch-src_init2_c,v 1.3 2005/11/03 17:01:05 niallo Exp $
+--- src/init2.c.orig	Sun Jan 16 14:35:57 2005
++++ src/init2.c	Thu Nov  3 14:11:16 2005
+@@ -200,19 +200,19 @@ void init_file_paths(char *path)
  
  	/* Build a path name */
--	strcpy(tail, "bone");
--	ANGBAND_DIR_BONE = string_make(path);
-+	ANGBAND_DIR_BONE = string_make("/var/games/angband/bone");
- 
- 	/* Build a path name */
--	strcpy(tail, "data");
--	ANGBAND_DIR_DATA = string_make(path);
-+	ANGBAND_DIR_DATA = string_make("/var/games/angband/data");
- 
- 	/* Build a path name */
- 	strcpy(tail, "edit");
-@@ -195,12 +193,10 @@
- #else /* USE_PRIVATE_SAVE_PATH */
- 
- 	/* Build a path name */
--	strcpy(tail, "apex");
+ 	strcpy(tail, "apex");
 -	ANGBAND_DIR_APEX = string_make(path);
 +	ANGBAND_DIR_APEX = string_make("/var/games/angband/apex");
  
  	/* Build a path name */
--	strcpy(tail, "save");
+ 	strcpy(tail, "bone");
+-	ANGBAND_DIR_BONE = string_make(path);
++	ANGBAND_DIR_BONE = string_make("/var/games/angband/bone");
+ 
+ 	/* Build a path name */
+ 	strcpy(tail, "data");
+-	ANGBAND_DIR_DATA = string_make(path);
++	ANGBAND_DIR_DATA = string_make("/var/games/angband/data");
+ 
+ 	/* Build a path name */
+ 	strcpy(tail, "save");
 -	ANGBAND_DIR_SAVE = string_make(path);
 +	ANGBAND_DIR_SAVE = string_make("/var/games/angband/save");
  
- #endif /* USE_PRIVATE_SAVE_PATH */
+ #endif /* USE_PRIVATE_PATHS */
  
diff --git a/games/angband/pkg/PLIST b/games/angband/pkg/PLIST
index 9ee3b7d87f4..f5be3896b32 100644
--- a/games/angband/pkg/PLIST
+++ b/games/angband/pkg/PLIST
@@ -1,5 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.9 2005/03/07 21:01:35 niallo Exp $
+@comment $OpenBSD: PLIST,v 1.10 2005/11/03 17:01:05 niallo Exp $
+@group games
+@mode g+s
 bin/angband
+@mode
 share/angband/
 @comment share/angband/apex/
 @comment share/angband/bone/
@@ -81,14 +84,11 @@ share/angband/script/spell.lua
 share/angband/script/store.lua
 share/angband/script/test.lua
 share/angband/script/trace.lua
-@comment share/angband/user/
+share/angband/user/
+share/angband/xtra/
 share/angband/xtra/font/
 share/angband/xtra/font/16x16.txt
-@comment share/angband/save/
-@comment share/angband/user/
-share/angband/xtra/
 @mode 775
-@group games
 @sample /var/games/angband/
 @sample /var/games/angband/apex/
 @sample /var/games/angband/save/