diff --git a/methods-of-information-in-medicine.csl b/methods-of-information-in-medicine.csl
index 89394b3b690..b711c6b9a51 100644
--- a/methods-of-information-in-medicine.csl
+++ b/methods-of-information-in-medicine.csl
@@ -25,7 +25,7 @@
   <locale xml:lang="en">
     <terms>
       <term name="no date" form="long">date unknown</term>
-      <term name="presented at">paper presented at</term>
+      <term name="presented at">presented at</term>
     </terms>
   </locale>
   <macro name="author">
@@ -45,19 +45,29 @@
     </names>
   </macro>
   <macro name="publisher">
-    <group delimiter="; ">
-      <group delimiter=": ">
-        <text variable="publisher-place"/>
-        <text variable="publisher"/>
-      </group>
-      <text macro="date"/>
-    </group>
+    <choose>
+      <if type="speech" match="any">
+        <group delimiter="; ">
+          <text macro="date"/>
+          <text variable="event-place"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter="; ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="date"/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="date">
     <choose>
       <if variable="issued">
         <choose>
-          <if type="report paper-conference" match="any">
+          <if type="report speech" match="any">
             <date form="text" date-parts="year-month-day" variable="issued"/>
           </if>
           <else>
@@ -129,7 +139,7 @@
               <text macro="publisher"/>
             </group>
           </if>
-          <else-if type="chapter" match="any">
+          <else-if type="chapter paper-conference" match="any">
             <group prefix=" ">
               <text term="in" suffix=": " text-case="capitalize-first"/>
               <text macro="editor"/>
@@ -142,11 +152,21 @@
               </group>
             </group>
           </else-if>
-          <else-if type="paper-conference" match="any">
+          <else-if type="speech" match="any">
             <group delimiter="; ">
               <group delimiter=": ">
-                <text term="presented at" text-case="capitalize-first"/>
-                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre" match="any">
+                      <text variable="genre" text-case="capitalize-first"/>
+                    </if>
+                    <else>
+                      <text value="Paper"/>
+                    </else>
+                  </choose>
+                  <text term="presented at"/>
+                </group>
+                <text variable="event"/>
               </group>
               <text macro="publisher"/>
             </group>