diff --git a/Repositories/otago_eprints3/otago_eprints/cfg/citations/eprint/default.xml b/Repositories/otago_eprints3/otago_eprints/cfg/citations/eprint/default.xml
index 0c6ac14..02091f4 100755
--- a/Repositories/otago_eprints3/otago_eprints/cfg/citations/eprint/default.xml
+++ b/Repositories/otago_eprints3/otago_eprints/cfg/citations/eprint/default.xml
@@ -28,7 +28,7 @@
 
 <if test="date">(<print expr="date" opts="res=year"/>)</if>
 
-<cite:linkhere><xhtml:em><print expr="title" opts="magicstop"/></xhtml:em></cite:linkhere>
+<cite:linkhere><xhtml:em><print expr="title" /></xhtml:em><if test="type = 'software' and is_set( id_number )">, version <print expr="id_number"/></if>.</cite:linkhere>
 
 <choose>
 
@@ -78,6 +78,10 @@
     <if test="place_of_pub"><print expr="place_of_pub"/></if>.
   </when>
 
+  <when test="type = 'software'">
+    <print expr="publisher"/><if test="place_of_pub">, <print expr="place_of_pub"/></if>.
+  </when>
+
   <otherwise>
     [<print expr="type"/>]
   </otherwise>