diff --git a/ChangeLog b/ChangeLog
index b90f093..59a3bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-16 David Young <dyoung@pobox.com>
+
+	* (many) reference <lib/version.h> rather than "version.h",
+	because version.h is a generated file and not present in the
+	source tree when using objdir builds.
+
 2004-03-03 PC Drew <pc@superiorcomm.net>
 
 	* lib/keychain.c: typecast time_t function to long, fixes compile
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index bb1a610..e6f6431 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -20,7 +20,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "prefix.h"
 #include "linklist.h"
 #include "stream.h"
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index effdddd..0ba19c2 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -25,7 +25,7 @@
 #include "command.h"
 #include "getopt.h"
 #include "thread.h"
-#include "version.h"
+#include <lib/version.h>
 #include "memory.h"
 #include "prefix.h"
 #include "log.h"
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index b952c00..1200750 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -27,7 +27,7 @@
 #include "getopt.h"
 #include "thread.h"
 #include "log.h"
-#include "version.h"
+#include <lib/version.h>
 #include "command.h"
 #include "vty.h"
 #include "memory.h"
diff --git a/lib/command.c b/lib/command.c
index 2411306..8b6ae3d 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -23,7 +23,7 @@
 
 #include "memory.h"
 #include "log.h"
-#include "version.h"
+#include <lib/version.h>
 #include "thread.h"
 #include "vector.h"
 #include "vty.h"
diff --git a/lib/print_version.c b/lib/print_version.c
index 4c9be04..1873faa 100644
--- a/lib/print_version.c
+++ b/lib/print_version.c
@@ -21,7 +21,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 
 void
 print_version (char *progname)
diff --git a/lib/smux.c b/lib/smux.c
index ddb8bfe..7e0a2ec 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -33,7 +33,7 @@
 #include "thread.h"
 #include "linklist.h"
 #include "command.h"
-#include "version.h"
+#include <lib/version.h>
 #include "memory.h"
 #include "sockunion.h"
 #include "smux.h"
diff --git a/lib/vty.c b/lib/vty.c
index 2b823e0..831660d 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -25,7 +25,7 @@
 #include "linklist.h"
 #include "thread.h"
 #include "buffer.h"
-#include "version.h"
+#include <lib/version.h>
 #include "command.h"
 #include "sockunion.h"
 #include "memory.h"
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index b14979f..712aa68 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -23,7 +23,7 @@
 #include <zebra.h>
 
 /* Include other stuffs */
-#include "version.h"
+#include <lib/version.h>
 #include "log.h"
 #include "getopt.h"
 #include "linklist.h"
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index f0a23eb..3b7cfc9 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -23,7 +23,7 @@
 #include "getopt.h"
 #include "thread.h"
 #include "log.h"
-#include "version.h"
+#include <lib/version.h>
 #include "command.h"
 #include "vty.h"
 #include "memory.h"
diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index 8c7af99..e867b1c 100644
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -27,7 +27,7 @@
 
 #ifndef HEADER_DEPENDENCY
 /* Include other stuffs */
-#include "version.h"
+#include <lib/version.h>
 #include "log.h"
 #include "getopt.h"
 #include "thread.h"
diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index 3a62a42..96ccb8b 100644
--- a/ospfclient/ospf_apiclient.c
+++ b/ospfclient/ospf_apiclient.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "thread.h"
 #include "prefix.h"
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 3f1e4fd..43aa5a4 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "thread.h"
 #include "prefix.h"
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 8b0d216..5d6b0ad 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -21,7 +21,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "thread.h"
 #include "command.h"
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 3beb227..d21ca30 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "vector.h"
 #include "vty.h"
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index f30aba4..ee09245 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -29,7 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "command.h"
 
diff --git a/zebra/main.c b/zebra/main.c
index a66734c..07467be 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -21,7 +21,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "command.h"
 #include "thread.h"