diff --git a/doc/Changelog b/doc/Changelog
index a7d52bf0d..f64c7b54b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,8 @@
 	- fixup asynclook test for nothreading (it creates only one process
 	  to do the extended test).
 	- changed name of ub_val_result_free to ub_val_resolve_free.
+	- removes warning message during library linking, renamed
+	  libunbound/unbound.c -> libunbound.c and worker to libworker.
 
 5 February 2008: Wouter
 	- statistics-interval: seconds option added.
diff --git a/libunbound/unbound.c b/libunbound/libunbound.c
similarity index 99%
rename from libunbound/unbound.c
rename to libunbound/libunbound.c
index 192cb8ba1..f1c025f7b 100644
--- a/libunbound/unbound.c
+++ b/libunbound/libunbound.c
@@ -45,7 +45,7 @@
 #include "libunbound/unbound.h"
 #include "config.h"
 #include "libunbound/context.h"
-#include "libunbound/worker.h"
+#include "libunbound/libworker.h"
 #include "util/locks.h"
 #include "util/config_file.h"
 #include "util/alloc.h"
diff --git a/libunbound/worker.c b/libunbound/libworker.c
similarity index 99%
rename from libunbound/worker.c
rename to libunbound/libworker.c
index 70ad68524..d17a61d28 100644
--- a/libunbound/worker.c
+++ b/libunbound/libworker.c
@@ -42,7 +42,7 @@
  * returns from the procedure when done.
  */
 #include "config.h"
-#include "libunbound/worker.h"
+#include "libunbound/libworker.h"
 #include "libunbound/context.h"
 #include "libunbound/unbound.h"
 #include "services/outside_network.h"
diff --git a/libunbound/worker.h b/libunbound/libworker.h
similarity index 100%
rename from libunbound/worker.h
rename to libunbound/libworker.h
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index 348dba612..36c7aa330 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -67,7 +67,7 @@
 #include "util/locks.h"
 #include "testcode/checklocks.h"
 #include "daemon/acl_list.h"
-#include "libunbound/worker.h"
+#include "libunbound/libworker.h"
 #include "libunbound/context.h"
 
 int