diff --git a/changehat/mod_apparmor/Makefile b/changehat/mod_apparmor/Makefile
index fae302b54..cadce792c 100644
--- a/changehat/mod_apparmor/Makefile
+++ b/changehat/mod_apparmor/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile 6135 2006-01-25 19:58:44Z steve $
+#	$Id$
 # ----------------------------------------------------------------------
 #    Copyright (c) 2004, 2005 NOVELL (All rights reserved)
 #
@@ -16,7 +16,7 @@
 # ----------------------------------------------------------------------
 NAME:=apache2-mod-apparmor
 all:
-COMMONDIR=../common/
+COMMONDIR=../../common/
 
 include Make.rules
 
diff --git a/changehat/mod_apparmor/apache2-mod-apparmor.spec.in b/changehat/mod_apparmor/apache2-mod-apparmor.spec.in
index f6c7f5c9f..9ed4ae19a 100644
--- a/changehat/mod_apparmor/apache2-mod-apparmor.spec.in
+++ b/changehat/mod_apparmor/apache2-mod-apparmor.spec.in
@@ -1,4 +1,4 @@
-# $Id: apache2-mod-apparmor.spec.in 6353 2006-03-31 02:26:46Z sarnold $
+# $Id$
 # ----------------------------------------------------------------------
 #    Copyright (c) 2004, 2005 NOVELL (All rights reserved)
 #
@@ -28,7 +28,7 @@
 Summary: AppArmor module for apache2.
 Name: apache2-mod-apparmor
 Version: @@immunix_version@@
-Release: 7.2
+Release: 8
 Group: Applications/System
 Source0: %{name}-%{version}-@@repo_version@@.tar.gz
 License: LGPL
@@ -134,6 +134,8 @@ make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro}
 %endif
 
 %changelog
+* Wed Apr 12 2006 - Steve Beattie <sbeattie@suse.de>
+- Move to novell forge svn repo; fix build issue with new layout
 * Thu Mar 30 2006 - Seth Arnold <seth.arnold@suse.de> 2.0-7.2
 - Relicense to LGPL
 * Mon Jan 30 2006 - Steve Beattie <sbeattie@suse.de> 2.0-7.1
diff --git a/changehat/mod_apparmor/mod_apparmor.c b/changehat/mod_apparmor/mod_apparmor.c
index 0f7675b82..3aa05fb03 100644
--- a/changehat/mod_apparmor/mod_apparmor.c
+++ b/changehat/mod_apparmor/mod_apparmor.c
@@ -1,4 +1,4 @@
-/* $Id: mod_apparmor.c 6354 2006-03-31 02:30:16Z sarnold $
+/* $Id$
  *
  *   Copyright (c) 2004, 2005, 2006 NOVELL (All rights reserved)
  *