diff --git a/csl/pnas.csl b/csl/pnas.csl
index cc08104f5..2f7945259 100644
--- a/csl/pnas.csl
+++ b/csl/pnas.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text">
   <info>
-    <title>PNAS Journal</title>
+    <title>PNAS Journal (dev)</title>
     <id>http://www.zotero.org/styles/pnas</id>
     <link href="http://www.zotero.org/styles/pnas"/>
     <author>
@@ -10,21 +10,19 @@
     </author>
     <category term="numeric"/>
     <category term="science"/>
-    <updated/>
+    <updated>2008-01-14T08:48:39+00:00</updated>
     <summary>The Proceedings of the National Academy of Sciences Journal style.</summary>
     <link href="http://www.pnas.org/misc/iforc.shtml" rel="documentation"/>
   </info>
   <macro name="editor">
-    <names variable="editor" delimiter=", ">
+    <names variable="editor" prefix=" " delimiter=", ">
       <label form="short" prefix="" text-case="lowercase" suffix=" "/>
-      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
-	     delimiter=", " delimiter-precedes-last="always"/>
+      <name initialize-with="" name-as-sort-order="all" sort-separator=" " delimiter=", " delimiter-precedes-last="always"/>
     </names>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	    delimiter=", " delimiter-precedes-last="always"/>
+    <names variable="author" prefix=" ">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" " suffix="." text-case="lowercase"/>
       <substitute>
 	<names variable="editor"/>
@@ -46,13 +44,10 @@
       </group>
     </group>
   </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
   <macro name="publisher">
-    <group prefix="(" delimiter=": " suffix=")">
-      <text variable="publisher-place"/>
+    <group prefix=" (" delimiter=", " suffix=")">
       <text variable="publisher"/>
+      <text variable="publisher-place"/>
     </group>
   </macro>
   <macro name="year-date">
@@ -63,9 +58,9 @@
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-	<group delimiter=" ">
+	<group prefix=". " delimiter=" ">
 	  <number variable="edition" form="ordinal"/>
-	  <text term="edition" form="short" suffix="."/>
+	  <text term="edition" form="short" text-case="capitalize-first" suffix="."/>
 	</group>
       </if>
       <else>
@@ -75,13 +70,16 @@
   </macro>
   <citation>
     <option name="collapse" value="citation-number"/>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number" />
+      <text variable="citation-number"/>
     </layout>
   </citation>
   <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="5"/>
+    <option name="second-field-align" value="true"/>
+    <option name="et-al-min" value="6"/>
     <option name="et-al-use-first" value="1"/>
     <layout suffix=".">
       <text variable="citation-number" suffix=". "/>
@@ -91,11 +89,11 @@
       </date>
       <choose>
 	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title"/>
+	  <group prefix=" ">
+	    <text variable="title" font-style="italic"/>
+	    <text macro="editor"/>
+	    <text macro="publisher"/>
 	    <text macro="edition"/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
 	  </group>
 	</if>
 	<else-if type="chapter">
@@ -110,23 +108,24 @@
 	  <group suffix=".">
 	    <text macro="publisher" prefix=" "/>
 	    <group prefix=", ">
-	      <label variable="page" suffix=". " form="short"/>
+	      <label variable="page" suffix=" " form="short"/>
 	      <text variable="page"/>
 	    </group>
 	  </group>
+        <text macro="edition"/>
 	</else-if>
 	<else>
-	  <text macro="title" prefix=" " suffix="."/>
+	  <text variable="title" prefix=" " suffix="."/>
 	  <group class="container" delimiter=":" prefix=" " suffix=".">
 	    <group delimiter=" ">
 	      <text variable="container-title" form="short" font-style="italic"/>
-	      <text variable="volume" />
+	      <text variable="volume"/>
 	    </group>
 	    <text variable="page"/>
 	  </group>
 	</else>
       </choose>
-      <text prefix=" " macro="access" />
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>