diff --git a/base/pam/hack-survive_autoconf.patch.cross b/base/pam/hack-survive_autoconf.patch.cross
new file mode 100644
index 000000000..7a82b5cad
--- /dev/null
+++ b/base/pam/hack-survive_autoconf.patch.cross
@@ -0,0 +1,43 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../pam/hack-survive_autoconf.patch.cross
+# Copyright (C) 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# 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.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+when make is called it calls auto* automatically because our version is
+newer than the one used by them.
+sadly the definition of LIBCRYPT relies on ac_lib which is not present
+when ac_cv_search_crypt is cached
+
+--- ./configure.in.orig	2009-04-10 22:53:41.000000000 +0300
++++ ./configure.in	2009-04-10 22:55:02.000000000 +0300
+@@ -358,7 +358,7 @@
+ 	       [test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
+ 
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[xcrypt crypt], [test "$ac_res" = "none required" || LIBCRYPT="$ac_res"], LIBCRYPT="")
+ AC_CHECK_FUNCS(crypt_r)
+ LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
+--- ./configure.orig	2009-03-02 17:12:08.000000000 +0200
++++ ./configure	2009-04-10 22:55:25.000000000 +0300
+@@ -14863,7 +14863,7 @@
+ ac_res=$ac_cv_search_crypt
+ if test "$ac_res" != no; then
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-  LIBCRYPT="-l$ac_lib"
++  test "$ac_res" = "none required" || LIBCRYPT="$ac_res"
+ else
+   LIBCRYPT=""
+ fi
diff --git a/base/pam/hostcc.patch.cross b/base/pam/hostcc.patch.cross
deleted file mode 100644
index a09014ace..000000000
--- a/base/pam/hostcc.patch.cross
+++ /dev/null
@@ -1,36 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../pam/hostcc.patch.cross
-# Copyright (C) 2006 - 2007 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# 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.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-use HOST_CC instead of CC when building the helpers to generate doc/
-
---- ./doc/specs/Makefile.in.orig	2007-03-24 23:25:53.000000000 +0100
-+++ ./doc/specs/Makefile.in	2007-03-24 23:26:35.000000000 +0100
-@@ -63,12 +63,12 @@
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+COMPILE = $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	--mode=compile $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = $(HOST_CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
diff --git a/base/pam/no-doc_specs.patch.cross b/base/pam/no-doc_specs.patch.cross
new file mode 100644
index 000000000..42674c274
--- /dev/null
+++ b/base/pam/no-doc_specs.patch.cross
@@ -0,0 +1,41 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../pam/no-doc_specs.patch.cross
+# Copyright (C) 2009 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# 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.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+doc/specs needs to use HOSTCC, but as they run automake our patching
+gets removed
+
+--- ./doc/Makefile.am.orig	2009-04-10 23:53:08.000000000 +0300
++++ ./doc/Makefile.am	2009-04-10 23:53:41.000000000 +0300
+@@ -2,7 +2,7 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+ 
+-SUBDIRS = man specs sag adg mwg
++SUBDIRS = man sag adg mwg
+ 
+ CLEANFILES = *~
+ 
+--- ./doc/Makefile.in.orig	2009-04-10 23:53:16.000000000 +0300
++++ ./doc/Makefile.in	2009-04-10 23:54:04.000000000 +0300
+@@ -241,7 +241,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = man specs sag adg mwg
++SUBDIRS = man sag adg mwg
+ CLEANFILES = *~
+ dist_html_DATA = index.html
+ all: all-recursive