diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
index ac3f56439e..b24218fba4 100644
--- a/csl/chicago-fullnote-bibliography.csl
+++ b/csl/chicago-fullnote-bibliography.csl
@@ -338,12 +338,18 @@
 	    </else>
 	  </choose>
 	  <choose>
-	    <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+	    <if type="graphic report" match="any">
 	      <group prefix=", " delimiter=", ">
 		<text variable="archive_location"/>
 		<text macro="archive"/>
 	      </group>
 	    </if>
+	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+	      <group prefix=", " delimiter=", ">
+		<text variable="archive_location"/>
+		<text macro="archive"/>
+	      </group>
+	    </else-if>
 	  </choose>
 	  <choose>
 	    <if variable="page" match="none">
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index 6841ce1fda..fdef17e115 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -292,12 +292,18 @@
 	  </else>
 	</choose>
 	<choose>
-	  <if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-	    <group delimiter=". ">
-	      <text variable="archive_location" text-case="title"/>
-	      <text macro="archive"/>
+	  <if type="graphic report" match="any">
+	    <group prefix=", " delimiter=", ">
+	  <text variable="archive_location"/>
+	  <text macro="archive"/>
 	    </group>
 	  </if>
+	  <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+	    <group prefix=", " delimiter=", ">
+	  <text variable="archive_location"/>
+	  <text macro="archive"/>
+	    </group>
+	  </else-if>
 	</choose>
 	<choose>
 	  <if variable="page" match="none">