diff --git a/ChangeLog b/ChangeLog
index 1957541e15..26207d7c9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,9 @@ Changes in version 0.2.0.19-alpha - 2008-02-??
       script, on fedora or redhat machines. Bugfix on 0.2.0.x.
     - Do not become confused when receiving a spurious VERSIONS-like
       cell from a confused v1 client.  Bugfix on 0.2.0.x.
+    - Re-fetch v2 (as well as v0) rend descriptors when all intro points for
+      a hidden service have failed.  Patch from Karsten Loesing.  Bugfix on
+      0.2.0.x.
 
   o Code simplifications and refactoring:
     - Remove some needless generality from cpuworker code, for improved
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index dc5db40adf..668d5db5cd 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1027,6 +1027,7 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn,
                  "No intro points for '%s': refetching service descriptor.",
                  safe_str(conn->rend_query));
         rend_client_refetch_renddesc(conn->rend_query);
+        rend_client_refetch_v2_renddesc(conn->rend_query);
         conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;
         return 0;
       }