diff --git a/Makefile b/Makefile
index e317e30..9f19999 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 # $Id$ 
 VERSION=0.4.2
 RELEASE?=0
-CC?=gcc
+CC=gcc
 DEBUG_CFLAGS?=-g -ggdb
 CFLAGS?=-O2
 LIBS?=-lldap -llber
-LD?=gcc 
+LD=gcc 
 LDFLAGS?=
 INSTALL_PREFIX?=
 PREFIXDIR?=/usr/local
@@ -73,6 +73,7 @@ rpm: tar
 	    -e 's#%RELEASE%#$(RELEASE)#g' \
 		-e 's#%RPMGROUP%#$(RPMGROUP)#g' \
 		-e 's#%OPENLDAPPKG%#$(OPENLDAPPKG)#g' \
+		-e 's#%MANDIR%#$(MANDIR)#g' \
 	    < $(SPECFILE).in > $(SPECFILE)
 		
 	mv ../ldap2dns-$(VERSION).tar.gz $(RPMBASE)/SOURCES
diff --git a/ldap2dns.c b/ldap2dns.c
index 911aa79..901c607 100644
--- a/ldap2dns.c
+++ b/ldap2dns.c
@@ -1,7 +1,7 @@
 /*
  * Create data from an LDAP directory service to be used for tinydns
  * $Id$
- * Copyright 2005-2006 by Ben Klang <ben@alkaloid.net>
+ * Copyright 2005-2008 by Ben Klang <ben@alkaloid.net>
  * Copyright 2000-2005 by Jacob Rief <jacob.rief@tiscover.com>
  * License: GPL version 2. See http://www.fsf.org for details
  */
@@ -42,7 +42,7 @@ static void print_version(void)
 	printf("\n");
 	printf("ldap2dns version %s\n", VERSION);
 	printf("\n");
-	printf("  Copyright 2005-2006 by Ben Klang <ben@alkaloid.net>\n");
+	printf("  Copyright 2005-2008 by Ben Klang <ben@alkaloid.net>\n");
 	printf("  Copyright 2000-2005 by Jacob Rief <jacob.rief@tiscover.com>\n");
 	printf("\n");
 	printf("  Released under the terms of the GPL.\n");
diff --git a/ldap2dns.spec.in b/ldap2dns.spec.in
index 974d8f4..2f064ab 100644
--- a/ldap2dns.spec.in
+++ b/ldap2dns.spec.in
@@ -67,6 +67,7 @@ make INSTALL_PREFIX=$RPM_BUILD_ROOT install
 %doc scripts/axfr2ldap.pl
 %doc scripts/data2ldif.pl
 %config /etc/openldap/schema/ldap2dns.schema
+%MANDIR%/man1/ldap2dns.1.gz
 
 %pre
 /usr/sbin/groupadd -g 161 -r ldap2dns >/dev/null 2>/dev/null || :