--- cpupower/bench/Makefile
+++ cpupower/bench/Makefile
@@ -16,7 +16,7 @@
 
 $(OUTPUT)cpufreq-bench: $(OBJS)
 	$(ECHO) "  CC      " $@
-	$(QUIET) $(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS)
+	$(QUIET) $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
 
 all: $(OUTPUT)cpufreq-bench
 
--- cpupower/Makefile
+++ cpupower/Makefile
@@ -34,7 +34,7 @@
 
 # Set the following to `true' to make a unstripped, unoptimized
 # binary. Leave this set to `false' for production use.
-DEBUG ?=	true
+DEBUG ?=	false
 
 # make the build silent. Set this to something else to make it noisy again.
 V ?=		false
@@ -57,7 +57,7 @@
 # Package-related definitions. Distributions can modify the version
 # and _should_ modify the PACKAGE_BUGREPORT definition
 
-VERSION=			$(shell ./utils/version-gen.sh)
+VERSION=			$(PV)
 LIB_MAJ=			0.0.0
 LIB_MIN=			0
 
@@ -72,11 +72,11 @@
 
 bindir ?=	/usr/bin
 sbindir ?=	/usr/sbin
-mandir ?=	/usr/man
+mandir ?=	/usr/share/man
 includedir ?=	/usr/include
 libdir ?=	/usr/lib
 localedir ?=	/usr/share/locale
-docdir ?=       /usr/share/doc/packages/cpupower
+docdir ?=       /usr/share/doc/$(P)
 confdir ?=      /etc/
 
 # Toolchain: what tools do we use, and what options do they need:
@@ -176,7 +176,7 @@
 	STRIPCMD = /bin/true -Since_we_are_debugging
 else
 	CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
-	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+	STRRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
 endif
 
 
@@ -208,7 +208,6 @@
 $(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ)
 	$(ECHO) "  CC      " $@
 	$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@
-	$(QUIET) $(STRIPCMD) $@
 
 $(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC)
 	$(ECHO) "  GETTEXT " $@