diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 7e0bf298b029..7fdbfb6472c9 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -46,18 +46,18 @@ in
 
 {
   bird = generic {
-    version = "1.6.3";
-    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+    version = "1.6.6";
+    sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
   };
 
   bird6 = generic {
-    version = "1.6.3";
-    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+    version = "1.6.6";
+    sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
     enableIPv6 = true;
   };
 
   bird2 = generic {
-    version = "2.0.2";
-    sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3";
+    version = "2.0.4";
+    sha256 = "1phl8ycasbzgla83d9zbzzy1ymjz30k1qh1pmywmjhbxa6vi0q37";
   };
 }
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
index 0a11c8a2a8d8..8f62670aee93 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch
+++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
@@ -1,13 +1,6 @@
-diff --git a/tools/Makefile.in b/tools/Makefile.in
-index 062ba91..4fd7453 100644
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
-@@ -68,7 +68,7 @@ tags:
- 	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
- 
+@@ -68,2 +68,2 @@
  install: all
--	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
 +	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
- 	if test -n "@CLIENT@" ; then								\
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
index fd86da8a1298..247164461183 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir-2.patch
+++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
@@ -1,13 +1,6 @@
-diff --git a/Makefile.in b/Makefile.in
-index fdd5e6c..45f81a1 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -165,7 +165,7 @@ tags:
- # Install
- 
+@@ -165,2 +165,2 @@
  install: all
--	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
 +	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
- 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
- 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
- 	if test -n "@CLIENT@" ; then								\