diff --git a/CHANGELOG b/CHANGELOG
index c8082829be3..24bcae8610b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 [master]
+    - Fixed bug 960 "FileNotFoundException in Journal abbreviations window" (by edukempf)
     - Change default behaviour to be more non-invasive: timestamps and owners are NOT set by default per entry.
     - "Open Folder" works again
     - newline separator can now be configured globally
diff --git a/src/main/java/net/sf/jabref/journals/ManageJournalsPanel.java b/src/main/java/net/sf/jabref/journals/ManageJournalsPanel.java
index ce0a21dc57a..e83ba449df1 100644
--- a/src/main/java/net/sf/jabref/journals/ManageJournalsPanel.java
+++ b/src/main/java/net/sf/jabref/journals/ManageJournalsPanel.java
@@ -345,13 +345,26 @@ public void storeSettings() {
         if (newFile.isSelected()) {
             if (newNameTf.getText().length() > 0) {
                 f = new File(newNameTf.getText());
+                if(!f.exists())
+                	if(new File(f.getPath().substring(0, f.getPath().lastIndexOf("/"))).exists()
+                			|| new File(f.getPath().substring(0, f.getPath().lastIndexOf("\\"))).exists()){
+                		try {
+							f.createNewFile();
+						} catch (IOException e) {
+							JOptionPane.showMessageDialog(this, "Could not create the file in the path specified");
+							e.printStackTrace();
+						}
+                	}else{
+                		JOptionPane.showMessageDialog(this, "Informed folder does not exist");
+                	}
+                
             }// else {
             //    return; // Nothing to do.
             //}
         } else
             f = new File(personalFile.getText());
 
-        if (f != null) {
+        if (f.exists()) {
             FileWriter fw = null;
             try {
                 fw = new FileWriter(f, false);
diff --git a/src/main/resources/help/About.html b/src/main/resources/help/About.html
index ff62f206661..ceac5f50f91 100644
--- a/src/main/resources/help/About.html
+++ b/src/main/resources/help/About.html
@@ -88,7 +88,8 @@ <h2>Contributions from:</h2>
         David Weitzman,
         Seb Wills,
         John Zedlewski,
-        Waluyo Adi Siswanto</p>
+        Waluyo Adi Siswanto,
+        Eduardo Kempf</p>
 
         <h2>Thanks to:</h2>