diff --git a/package/base/dmapi/buildmacros.patch b/package/base/dmapi/buildmacros.patch
new file mode 100644
index 000000000..bc3434be9
--- /dev/null
+++ b/package/base/dmapi/buildmacros.patch
@@ -0,0 +1,30 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/dmapi/buildmacros.patch
+# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./include/buildmacros.orig	2004-12-05 08:09:03.778078400 +0100
++++ ./include/buildmacros	2004-12-05 08:09:15.082359888 +0100
+@@ -102,8 +102,6 @@
+ 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+ 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+ 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+-	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+ 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
diff --git a/package/hannes/dmapi/dmapi.conf b/package/base/dmapi/dmapi.conf
similarity index 95%
rename from package/hannes/dmapi/dmapi.conf
rename to package/base/dmapi/dmapi.conf
index 6da78b339..8e36d02c8 100644
--- a/package/hannes/dmapi/dmapi.conf
+++ b/package/base/dmapi/dmapi.conf
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/hannes/dmapi/dmapi.conf
+# ROCK Linux: rock-src/package/base/dmapi/dmapi.conf
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/package/hannes/dmapi/dmapi.desc b/package/base/dmapi/dmapi.desc
similarity index 96%
rename from package/hannes/dmapi/dmapi.desc
rename to package/base/dmapi/dmapi.desc
index 99e66e839..2e67fcf79 100644
--- a/package/hannes/dmapi/dmapi.desc
+++ b/package/base/dmapi/dmapi.desc
@@ -5,7 +5,7 @@
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
-[COPY] ROCK Linux: rock-src/package/hannes/dmapi/dmapi.desc
+[COPY] ROCK Linux: rock-src/package/base/dmapi/dmapi.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
diff --git a/package/hannes/dmapi/install.patch b/package/base/dmapi/install.patch
similarity index 100%
rename from package/hannes/dmapi/install.patch
rename to package/base/dmapi/install.patch
diff --git a/package/hannes/xfsdump/xfsdump.conf b/package/base/xfsdump/xfsdump.conf
similarity index 95%
rename from package/hannes/xfsdump/xfsdump.conf
rename to package/base/xfsdump/xfsdump.conf
index 07ad6542f..33bc24f5d 100644
--- a/package/hannes/xfsdump/xfsdump.conf
+++ b/package/base/xfsdump/xfsdump.conf
@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/hannes/xfsdump/xfsdump.conf
+# ROCK Linux: rock-src/package/base/xfsdump/xfsdump.conf
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
diff --git a/package/hannes/xfsdump/xfsdump.desc b/package/base/xfsdump/xfsdump.desc
similarity index 96%
rename from package/hannes/xfsdump/xfsdump.desc
rename to package/base/xfsdump/xfsdump.desc
index 8fa527994..42c238bc2 100644
--- a/package/hannes/xfsdump/xfsdump.desc
+++ b/package/base/xfsdump/xfsdump.desc
@@ -5,7 +5,7 @@
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
-[COPY] ROCK Linux: rock-src/package/hannes/xfsdump/xfsdump.desc
+[COPY] ROCK Linux: rock-src/package/base/xfsdump/xfsdump.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
diff --git a/package/hannes/dmapi/buildmacros.patch b/package/hannes/dmapi/buildmacros.patch
deleted file mode 100644
index 60586790b..000000000
--- a/package/hannes/dmapi/buildmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/buildmacros.orig	2004-12-05 08:09:03.778078400 +0100
-+++ ./include/buildmacros	2004-12-05 08:09:15.082359888 +0100
-@@ -102,8 +102,6 @@
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
- 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
- 	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)