diff --git a/Makefile.in b/Makefile.in
index c0042b350..a03368964 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,7 +257,7 @@ endif
 
 unbound$(EXEEXT):	$(DAEMON_OBJ) libunbound.la
 	$(INFO) Link $@
-	$Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(EXTRALINK) -lssl $(LIBS)
+	$Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(EXTRALINK) -L. -L.libs -lunbound -lssl $(LIBS)
 
 unbound-checkconf$(EXEEXT):	$(CHECKCONF_OBJ) libunbound.la
 	$(INFO) Link $@
diff --git a/doc/Changelog b/doc/Changelog
index 030b44788..0bb9455b4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 October 2011: Matthijs
+	- link unbound against unbound library
+
 27 September 2011: Wouter
 	- unbound.exe -w windows option for start and stop service.