diff --git a/Makefile.am b/Makefile.am
index c94861a7997d90f06cf4355e937fc4d1f24f54ed..12c06a2b08a554a51aba1f15d25d8ef7a44ced0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,8 @@ EXTRA_DIST =			\
 	AUTHORS			\
 	INSTALL			\
 	NEWS			\
-	ChangeLog		
+	ChangeLog		\
+	META
 	
 slurmincludedir=$(includedir)/slurm
 slurminclude_HEADERS =		\
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index e472fb8a1788df5e6816952653acd02b3c17de13..93d8586d30dc0cca82a79ace8862eabcd562daf5 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -71,7 +71,7 @@ available. By default, \fB\-\-immediate\fR is off, and
 .B srun
 will block until resources become available.
 .TP
-\fB\-k\fR, \fB\-\-kill-off\fR
+\fB\-k\fR, \fB\-\-no-kill\fR
 Do not automatically terminate a job of one of the nodes it has been allocated 
 fails. The job will assume all responsibilities for fault-tolerance. The 
 default action is to terminate the job upon node failure.
diff --git a/slurm.spec.in b/slurm.spec.in
index ad1846c512d6dce16a868a12389344a44ba3c469..1b0f29391f41e2c20699c5c436f585f2b6d550e0 100644
--- a/slurm.spec.in
+++ b/slurm.spec.in
@@ -25,7 +25,6 @@ Requires: openssl >= 0.9.6
 %if %{?_with_debug:1}%{!?_with_debug:0}
   %define _enable_debug --enable-debug
   %define __os_install_post /usr/lib/rpm/brp-compress
-  CFLAGS="-g -Wall"
 %endif
 
 #
@@ -80,17 +79,12 @@ SLURM authentication module for Chris Dunlap's Munge
 %setup -n %{name}-%{version}-%{release}
 
 %build
-PFX_FIX=--program-prefix=%{?_program_prefix:%{_program_prefix}} 
-WITHCONF=--sysconfdir=/etc/slurm
-
-# for now we build with debugging symbols
-
-%configure \
-    $PFX_FIX $WITHCONF                   \
-    %{?_enable_debug}                    \
-    %{?_with_elan}                       \
-    %{?_without_elan}                    \
-    %{?_with_totalview}                  \
+%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
+    --sysconfdir=/etc/slurm		\
+    %{?_enable_debug}                   \
+    %{?_with_elan}                      \
+    %{?_without_elan}                   \
+    %{?_with_totalview}                 \
     %{?_without_totalview}
 
 #