diff -Nru openswan-2.6.31.orig/lib/libcrypto/libmd5/Makefile openswan-2.6.31/lib/libcrypto/libmd5/Makefile
--- openswan-2.6.31.orig/lib/libcrypto/libmd5/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libcrypto/libmd5/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -12,7 +12,7 @@
 
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
 endif
 
 include ${srcdir}../../Makefile.library
diff -Nru openswan-2.6.31.orig/lib/libcrypto/libsha1/Makefile openswan-2.6.31/lib/libcrypto/libsha1/Makefile
--- openswan-2.6.31.orig/lib/libcrypto/libsha1/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libcrypto/libsha1/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -12,7 +12,7 @@
 
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS  
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
 endif
 
 
diff -Nru openswan-2.6.31.orig/lib/libcrypto/libsha2/Makefile openswan-2.6.31/lib/libcrypto/libsha2/Makefile
--- openswan-2.6.31.orig/lib/libcrypto/libsha2/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libcrypto/libsha2/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -15,5 +15,5 @@
 
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
 endif
diff -Nru openswan-2.6.31.orig/lib/libdns/Makefile openswan-2.6.31/lib/libdns/Makefile
--- openswan-2.6.31.orig/lib/libdns/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libdns/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -31,7 +31,7 @@
 		-I. -I./include -I${srcdir}include \
 		-I${srcdir}../libisc/include
 CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
-CWARNINGS = -Werror
+CWARNINGS =
 
 CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
 
diff -Nru openswan-2.6.31.orig/lib/libipsecconf/Makefile openswan-2.6.31/lib/libipsecconf/Makefile
--- openswan-2.6.31.orig/lib/libipsecconf/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libipsecconf/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -33,7 +33,7 @@
 #CFLAGS+=-DFIPS_CHECK
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
 endif
 
 ifeq ($(USE_NM),true)
diff -Nru openswan-2.6.31.orig/lib/libisc/Makefile openswan-2.6.31/lib/libisc/Makefile
--- openswan-2.6.31.orig/lib/libisc/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libisc/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -23,7 +23,7 @@
 		-I. -I./include -I${srcdir}include \
 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
 CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
-# CWARNINGS = -Werror
+CWARNINGS =
 
 CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
 
diff -Nru openswan-2.6.31.orig/lib/liblwres/Makefile openswan-2.6.31/lib/liblwres/Makefile
--- openswan-2.6.31.orig/lib/liblwres/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/liblwres/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -23,7 +23,7 @@
 		-I${srcdir}../libisc/include \
 		-I. -I./include -I${srcdir}include 
 CDEFINES =
-CWARNINGS = -Werror
+CWARNINGS =
 
 CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
 
diff -Nru openswan-2.6.31.orig/lib/libopenswan/Makefile openswan-2.6.31/lib/libopenswan/Makefile
--- openswan-2.6.31.orig/lib/libopenswan/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/lib/libopenswan/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -100,7 +100,7 @@
 
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
 endif
 
 ifeq ($(USE_MODP_RFC5114),true)
diff -Nru openswan-2.6.31.orig/Makefile.inc openswan-2.6.31/Makefile.inc
--- openswan-2.6.31.orig/Makefile.inc	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/Makefile.inc	2010-11-27 13:16:46.000000000 +0100
@@ -49,7 +49,7 @@
 DESTDIR?=
 
 # "local" part of tree, used in building other pathnames
-INC_USRLOCAL=/usr/local
+INC_USRLOCAL?=/usr
 
 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
 # settings which are assumed to include it (or at least, to include *some*
diff -Nru openswan-2.6.31.orig/packaging/makefiles/module.make openswan-2.6.31/packaging/makefiles/module.make
--- openswan-2.6.31.orig/packaging/makefiles/module.make	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/packaging/makefiles/module.make	2010-11-27 13:16:46.000000000 +0100
@@ -25,7 +25,6 @@
 
 EXTRA_CFLAGS += $(KLIPSCOMPILE)
 EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX
-#EXTRA_CFLAGS += -Werror
 #EXTRA_CFLAGS += -Wconversion 
 #EXTRA_CFLAGS += -Wmissing-prototypes 
 # 'override CFLAGS' should really be 'EXTRA_CFLAGS'
diff -Nru openswan-2.6.31.orig/programs/Makefile.program openswan-2.6.31/programs/Makefile.program
--- openswan-2.6.31.orig/programs/Makefile.program	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/programs/Makefile.program	2010-11-27 13:16:46.000000000 +0100
@@ -48,12 +48,7 @@
 CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\"
 CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\"
 
-# die if there are any warnings
-ifndef WERROR
-WERROR:= -Werror
-endif
 
-CFLAGS+= ${WERROR}
 
 ifneq ($(LD_LIBRARY_PATH),)
 LDFLAGS=-L$(LD_LIBRARY_PATH)
@@ -104,8 +99,6 @@
 ifneq ($(NOINSTALL),true)
 
 doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
-	# remove any old vendor file installed previously
-	@rm -f $(FINALLIBEXECDIR)/vendor
 	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
 	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
 	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
@@ -180,6 +173,7 @@
 LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp
 else
 LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3
+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
 endif
 
 
diff -Nru openswan-2.6.31.orig/programs/pluto/Makefile.options openswan-2.6.31/programs/pluto/Makefile.options
--- openswan-2.6.31.orig/programs/pluto/Makefile.options	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/programs/pluto/Makefile.options	2010-11-27 13:16:46.000000000 +0100
@@ -44,7 +44,7 @@
 
 # -O on Linux makes gcc coredump when compiling sha1.c
 # -Wundef is nice but RHL5.2 compiler doesn't support it
-CFLAGS +=-g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
+CFLAGS +=-Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
 	-Wcast-qual -Wmissing-declarations -Wwrite-strings \
 	-Wstrict-prototypes # -Wundef
 
@@ -54,7 +54,7 @@
 
 # Use LIBNSS
 ifeq ($(USE_LIBNSS),true)
-HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3	
+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss	
 endif
 
 # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN
@@ -306,6 +306,7 @@
 DEFINES+=-DHAVE_LIBNSS
 LIBSPLUTO+= -lnspr4
 LIBSPLUTO+= -lnss3
+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
 # For avoiding implicit DSO linking
 LIBSPLUTO+= -lpthread
 ifeq ($(USE_FIPSCHECK),true)
diff -Nru openswan-2.6.31.orig/programs/rsasigkey/Makefile openswan-2.6.31/programs/rsasigkey/Makefile
--- openswan-2.6.31.orig/programs/rsasigkey/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/programs/rsasigkey/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -21,13 +21,14 @@
 FIPS_CHECK=1
 CFLAGS+=-DFIPS_CHECK
 endif
-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
 endif
 
 PROGRAM=rsasigkey
 LIBS=${OPENSWANLIB} -lgmp
 ifeq ($(USE_LIBNSS),true)
 LIBS+= -lnspr4 -lnss3 -lplc4
+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
 ifeq ($(USE_FIPSCHECK),true)
 LIBS+=  -lfipscheck
 endif
diff -Nru openswan-2.6.31.orig/programs/setup/Makefile openswan-2.6.31/programs/setup/Makefile
--- openswan-2.6.31.orig/programs/setup/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/programs/setup/Makefile	2010-11-27 13:17:15.000000000 +0100
@@ -16,11 +16,7 @@
 OPENSWANSRCDIR?=$(shell cd ../..; pwd)
 include ${OPENSWANSRCDIR}/Makefile.inc
 
-# this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
-# not as /etc/rc.d/init.d/setup.
-PROGRAMDIR=$(RCDIR)
 PROGRAM=setup
-NOINSTALL=true
 EXTRA8MAN=setup.8
 
 include ${srcdir}../Makefile.program
@@ -34,13 +30,11 @@
 	# remove any old vendor file installed previously
 	@rm -f $(BINDIR)/setup
 	# check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec)
-	@mkdir -p $(RCDIR) $(BINDIR)
+	@mkdir -p $(BINDIR)
 	# install and link everything
-	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
-	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
+	@$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup
 
 install_file_list::
-	@echo $(RCDIR)/ipsec
 	@echo $(BINDIR)/setup
 
 cleanall::
diff -Nru openswan-2.6.31.orig/programs/showhostkey/Makefile openswan-2.6.31/programs/showhostkey/Makefile
--- openswan-2.6.31.orig/programs/showhostkey/Makefile	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/programs/showhostkey/Makefile	2010-11-27 13:16:46.000000000 +0100
@@ -16,7 +16,7 @@
 include ${OPENSWANSRCDIR}/Makefile.inc
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
 endif
 
 PROGRAM=showhostkey
diff -Nru openswan-2.6.31.orig/testing/utils/make-uml.sh openswan-2.6.31/testing/utils/make-uml.sh
--- openswan-2.6.31.orig/testing/utils/make-uml.sh	2010-10-18 18:13:36.000000000 +0200
+++ openswan-2.6.31/testing/utils/make-uml.sh	2010-11-27 13:16:46.000000000 +0100
@@ -262,7 +262,7 @@
 
 cd $OPENSWANSRCDIR || exit 1
 
-make WERROR=-Werror USE_OBJDIR=true programs
+make USE_OBJDIR=true programs
 
 # now, execute the Makefile that we have created!
 cd $POOLSPACE && make $OPENSWANHOSTS