diff --git a/ChangeLog b/ChangeLog
index f22df17..7e04cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2006-02-14  Guillem Jover  <guillem@debian.org>
+
+	* arc4random.c: Move to ...
+	* src/arc4random.c: ... here.
+	* bsd_getopt.c: Move to ...
+	* src/bsd_getopt.c:: ... here.
+	* err.c: Move to ...
+	* src/err.c:: ... here.
+	* fgetln.c: Move to ...
+	* src/fgetln.c:: ... here.
+	* fmtcheck.c: Move to ...
+	* src/fmtcheck.c:: ... here.
+	* inet_net_pton.c: Move to ...
+	* src/inet_net_pton.c:: ... here.
+	* strlcat.c: Move to ...
+	* src/strlcat.c:: ... here.
+	* strlcpy.c: Move to ...
+	* src/strlcpy.c:: ... here.
+	* md5c.c: Move to ...
+	* src/md5c.c:: ... here.
+	* md5.copyright: Move to ...
+	* src/md5.copyright:: ... here.
+	* Makefile (LIB_SRCS): Automatically prefix the src/ dir.
+
 2006-02-14  Guillem Jover  <guillem@debian.org>
 
 	* Makefile (LIB_SRCS): Line wrap.
diff --git a/Makefile b/Makefile
index 9ea5e2c..3e6b2cc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,9 @@
 # $Id$
 #
 
-LIB_SRCS = arc4random.c bsd_getopt.c err.c fgetln.c inet_net_pton.c \
-	   strlcat.c strlcpy.c md5c.c fmtcheck.c
+LIB_SRCS := arc4random.c bsd_getopt.c err.c fgetln.c inet_net_pton.c \
+	    strlcat.c strlcpy.c md5c.c fmtcheck.c
+LIB_SRCS := $(patsubst %,src/%,$(LIB_SRCS))
 
 LIB_INCLUDES := err.h getopt.h ip_icmp.h random.h queue.h md5.h string.h \
 		bsd.h stdlib.h
diff --git a/arc4random.c b/src/arc4random.c
similarity index 100%
rename from arc4random.c
rename to src/arc4random.c
diff --git a/bsd_getopt.c b/src/bsd_getopt.c
similarity index 100%
rename from bsd_getopt.c
rename to src/bsd_getopt.c
diff --git a/err.c b/src/err.c
similarity index 100%
rename from err.c
rename to src/err.c
diff --git a/fgetln.c b/src/fgetln.c
similarity index 100%
rename from fgetln.c
rename to src/fgetln.c
diff --git a/fmtcheck.c b/src/fmtcheck.c
similarity index 100%
rename from fmtcheck.c
rename to src/fmtcheck.c
diff --git a/inet_net_pton.c b/src/inet_net_pton.c
similarity index 100%
rename from inet_net_pton.c
rename to src/inet_net_pton.c
diff --git a/md5.copyright b/src/md5.copyright
similarity index 100%
rename from md5.copyright
rename to src/md5.copyright
diff --git a/md5c.c b/src/md5c.c
similarity index 100%
rename from md5c.c
rename to src/md5c.c
diff --git a/strlcat.c b/src/strlcat.c
similarity index 100%
rename from strlcat.c
rename to src/strlcat.c
diff --git a/strlcpy.c b/src/strlcpy.c
similarity index 100%
rename from strlcpy.c
rename to src/strlcpy.c