diff --git a/.cvsignore b/.cvsignore
index 35348f3..382d238 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-openslp-1.2.0.tar.gz
+openslp-1.2.1.tar.gz
diff --git a/openslp-1.2.0-optflags.patch b/openslp-1.2.0-optflags.patch
deleted file mode 100644
index 6899f88..0000000
--- a/openslp-1.2.0-optflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openslp-1.2.0/configure.in.optflags	2004-07-15 09:03:43.000000000 -0500
-+++ openslp-1.2.0/configure.in	2004-02-04 14:07:33.000000000 -0600
-@@ -126,7 +126,7 @@
-        CFLAGS="$CFLAGS -Werror"
-     fi
-     if test X"$debug" = X"no"; then 
--       OPTFLAGS="-O3"
-+       OPTFLAGS="-O3 $RPM_OPT_FLAGS "
-     fi
-     
- elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
diff --git a/openslp-1.2.1-optflags.patch b/openslp-1.2.1-optflags.patch
new file mode 100644
index 0000000..801d07e
--- /dev/null
+++ b/openslp-1.2.1-optflags.patch
@@ -0,0 +1,22 @@
+--- openslp-1.2.1/configure.in.optflags	2005-02-15 14:06:02.000000000 -0600
++++ openslp-1.2.1/configure.in	2005-03-04 06:53:02.000000000 -0600
+@@ -130,7 +130,7 @@
+        CFLAGS="$CFLAGS -Werror"
+     fi
+     if test X"$debug" = X"no"; then 
+-       OPTFLAGS="-O3"
++       OPTFLAGS="-O3 $RPM_OPT_FLAGS"
+     fi
+     
+ elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
+--- openslp-1.2.1/configure.optflags	2005-03-02 12:00:28.000000000 -0600
++++ openslp-1.2.1/configure	2005-03-04 06:53:04.000000000 -0600
+@@ -20596,7 +20596,7 @@
+        CFLAGS="$CFLAGS -Werror"
+     fi
+     if test X"$debug" = X"no"; then
+-       OPTFLAGS="-O3"
++       OPTFLAGS="-O3 $RPM_OPT_FLAGS"
+     fi
+ 
+ elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
diff --git a/openslp.spec b/openslp.spec
index ac13836..3c64182 100644
--- a/openslp.spec
+++ b/openslp.spec
@@ -1,25 +1,23 @@
-# $Id: openslp.spec,v 1.7 2005/05/23 00:20:08 katzj Exp $
-
-%define pie 1
+# $Id: openslp.spec,v 1.8 2005/10/21 18:56:57 rdieter Exp $
 
 Summary: Open implementation of Service Location Protocol V2
 Name:    openslp
-Version: 1.2.0
-Release: 6%{?dist_tag}
+Version: 1.2.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: BSD
-#URL:     http://www.openslp.org/
 URL:     http://sourceforge.net/projects/openslp/
-Source:  http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.0.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source:  http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.1.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: slpd.init
-Patch1:  openslp-1.2.0-optflags.patch
+Patch1:  openslp-1.2.1-optflags.patch
 
-BuildRequires: autoconf automake libtool
-BuildRequires: bison flex
-#BuildRequires: byacc
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: bison
+BuildRequires: flex 
 BuildRequires: openssl-devel
 
 %description
@@ -42,7 +40,7 @@ OpenSLP header files and libraries.
 Summary: OpenSLP server daemon
 Group:   System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
-Requires(preun): chkconfig /sbin/service
+Requires(preun): chkconfig, /sbin/service
 Requires(post): chkconfig
 Requires(postun): /sbin/service
 %description server
@@ -54,6 +52,7 @@ OpenSLP server daemon to dynamically register services.
 
 %patch1 -p1 -b .optflags
 
+# tarball goof (?), it wants to re-automake anyway, so let's do it right.
 libtoolize --force
 aclocal
 autoconf
@@ -62,18 +61,15 @@ automake --add-missing
 # remove CVS leftovers...
 find . -name "CVS" | xargs rm -rf
 
-# remove hard-coded compiler flags: -O3 -Wall
-perl -pi -e "s@-O3@@g" configure
-#perl -pi -e "s@-Wall@@g" configure
-
 
 %build
 
-%{?pie:export CFLAGS="-fPIC $RPM_OPT_FLAGS"; export LDFLAGS="-pie"}
+export LDFLAGS="-pie"
 
 %configure \
-  --disable-static
-# --enable-slpv2-security
+  --disable-dependency-tracking \
+  --disable-static \
+  --enable-slpv2-security
 # --enable-async-api
 
 make %{?_smp_mflags}
@@ -88,7 +84,7 @@ install -p -D -m755  %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/slpd
 
 # nuke unpackaged/unwanted files
 rm -rf $RPM_BUILD_ROOT/usr/doc
-rm -f  $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
@@ -96,19 +92,22 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %post server
 /sbin/chkconfig --add slpd
 
 %preun server
+# on remove
 if [ $1 -eq 0 ]; then
   /sbin/service slpd stop >/dev/null 2>&1 ||:
   /sbin/chkconfig --del slpd
 fi
 
 %postun server
-if [ $1 -ge 1 ]; then
+# on upgrade
+if [ $1 -gt 0 ]; then
   /sbin/service slpd condrestart >/dev/null 2>&1
 fi
 
@@ -116,15 +115,15 @@ fi
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING FAQ NEWS README THANKS
-%doc doc/html/IntroductionToSLP
-%doc doc/html/UsersGuide
-%doc doc/html/faq*
 %config(noreplace) %{_sysconfdir}/slp.conf
 %{_bindir}/*
 %{_libdir}/lib*.so.*
 
 %files server
 %defattr(-,root,root)
+%doc doc/html/IntroductionToSLP
+%doc doc/html/UsersGuide
+%doc doc/html/faq*
 %{_sbindir}/*
 %config(noreplace) %{_sysconfdir}/slp.reg
 %config(noreplace) %{_sysconfdir}/slp.spi
@@ -139,6 +138,12 @@ fi
 
 
 %changelog
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.1-1
+- 1.2.1
+- move most docs to -server
+- --enable-slpv2-security
+- --disable-dependency-tracking
+
 * Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1.2.0
 - rebuild on all arches
 
diff --git a/slpd.init b/slpd.init
index 24b24c9..483e703 100644
--- a/slpd.init
+++ b/slpd.init
@@ -249,7 +249,7 @@ case "$1" in
     fi
     ;;
   *)
-    echo "Usage: slpd {start|stop|restart|reload|status}"
+    echo "Usage: slpd {start|stop|restart|condrestart|reload|status}"
     exit 1
 esac
 
diff --git a/sources b/sources
index a61bc24..5b1e932 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b101a73c11d759c6d7a48483f887fae7  openslp-1.2.0.tar.gz
+ff9999d1b44017281dd00ed2c4d32330  openslp-1.2.1.tar.gz