diff --git a/changes/bug6404 b/changes/bug6404
new file mode 100644
index 0000000000..d01964d1e5
--- /dev/null
+++ b/changes/bug6404
@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+
+    - Increase the maximum length of microdescriptor we are willing to
+      generate from 1K to 2K. Occasionally this is needed for routers
+      with complex policies or family declarations. Partial fix for
+      bug 6404; fix on 0.2.2.6-alpha.
+
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 79958739a5..85ea85ce73 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -3502,7 +3502,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri)
 {
   microdesc_t *result = NULL;
   char *key = NULL, *summary = NULL, *family = NULL;
-  char buf[1024];
+  char buf[2048];
   size_t keylen;
   char *out = buf, *end = buf+sizeof(buf);