diff --git a/Makefile b/Makefile
index ead86b8b..bce01835 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ NAME=cntlm
 VER=`cat VERSION`
 DIR=`pwd`
 
-$(NAME): .config-stamp $(OBJS)
+$(NAME): configure-stamp $(OBJS)
 	@echo "Linking $@"
 	@$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
@@ -74,7 +74,7 @@ uninstall:
 	rm -f $(BINDIR)/$(NAME) $(MANDIR)/man1/$(NAME).1 2>/dev/null || true
 
 clean:
-	@rm -f *.o tags cntlm endian pid .config-stamp 2>/dev/null
+	@rm -f *.o tags cntlm endian pid configure-stamp config/config.h 2>/dev/null
 
 cleanp:
 	@rm -f *.deb *.tgz *.tar.gz *.rpm *.o tags cntlm pid massif* callgrind* 2>/dev/null
diff --git a/config/config.h b/config/config.h
deleted file mode 100644
index c6329a79..00000000
--- a/config/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define config_endian 1
-#define config_strdup 1
-#define config_gethostname 1
diff --git a/configure b/configure
index 0986a9d0..937f171e 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CC=gcc
-STAMP=.config-stamp
+STAMP=configure-stamp
 CONFIG=config/config.h
 TESTS="endian strdup gethostname"