diff --git a/Makefile.in b/Makefile.in
index 207b91156053899a3fee9665ec789b05a84e20be..ee339ca97d7537943ffa425386c9c19706f1f85e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,6 @@
 
+INSTALL = install
+
 BIN_PROGRAMS = \
 	noblogs \
 	noblogsmr \
@@ -8,16 +10,17 @@ BIN_PROGRAMS = \
 LIB_FILES = \
 	$(wildcard lib/*.php)
 
+NOBLOGS_BIN_DIR = @NOBLOGS_BIN_DIR@
 NOBLOGS_LIB_DIR = @NOBLOGS_LIB_DIR@
 
 all:
 
 install:
-	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_BIN_DIR)
 	(for f in $(BIN_PROGRAMS) ; do \
-		$(INSTALL) -m 755 $(srcdir)/bin/$$f $(DESTDIR)$(bindir)/$$f ; \
+		$(INSTALL) -m 755 bin/$$f $(DESTDIR)$(NOBLOGS_BIN_DIR)/$$f ; \
 	 done)
 	$(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_LIB_DIR)
 	(for f in $(LIB_FILES:lib/%=%) ; do \
-		$(INSTALL) -m 755 $(srcdir)/lib/$$f $(DESTDIR)$(NOBLOGS_LIB_DIR)/$$f ; \
+		$(INSTALL) -m 755 lib/$$f $(DESTDIR)$(NOBLOGS_LIB_DIR)/$$f ; \
 	 done)
diff --git a/configure.ac b/configure.ac
index 5e5eb98a348ff8dfb36e89eabb001e2bb8a8438f..24495779a0ffcd6f4335ccee0e0acb9d3cabc6e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,16 @@ AC_ARG_WITH(alert-email,
 ALERT_EMAIL="$alert_email"
 AC_SUBST(ALERT_EMAIL)
 
-NOBLOGS_LIB_DIR=`eval echo "$prefix/lib/noblogs-cli"`
+dnl We need to look at the value of --prefix *now*, not later.
+inst_prefix="$prefix"
+if test "$prefix" = "NONE" ; then
+  inst_prefix="$ac_default_prefix"
+fi
+  
+NOBLOGS_LIB_DIR="$inst_prefix/lib/noblogs-cli"
 AC_SUBST(NOBLOGS_LIB_DIR)
+NOBLOGS_BIN_DIR="$inst_prefix/bin"
+AC_SUBST(NOBLOGS_BIN_DIR)
 
 AC_OUTPUT(
 Makefile