diff --git a/CHANGES.md b/CHANGES.md
index 474e878..9f18f95 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Tue, September 6
  - Add support for building an .exe package.
  - Add support for building an .zip Windows portable package.
  - Add support for building an .rpm package.
+ - Destroy headless process if it goes too long.
 
 Mon, September 5
 ----------------
diff --git a/config.sh b/config.sh
index bb2eef4..6d87b22 100755
--- a/config.sh
+++ b/config.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env sh
 export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
-export GITHUB_NAME="Add sha256sums to releases"
+export GITHUB_NAME="Destroy headless process if it goes too long"
 export GITHUB_DESCRIPTION=$(cat CHANGES.md)
-export GITHUB_TAG=0.0.30
\ No newline at end of file
+export GITHUB_TAG=0.0.31
\ No newline at end of file
diff --git a/src/java/net/i2p/i2pfirefox/I2PFirefox.java b/src/java/net/i2p/i2pfirefox/I2PFirefox.java
index aef7c78..305da55 100644
--- a/src/java/net/i2p/i2pfirefox/I2PFirefox.java
+++ b/src/java/net/i2p/i2pfirefox/I2PFirefox.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 
 /**
  * I2PFirefox.java
@@ -508,13 +509,15 @@ public class I2PFirefox extends I2PCommonBrowser {
           try {
             Process hp = hpb.start();
             try {
-              int hev = hp.waitFor();
+              boolean hev = hp.waitFor(20, TimeUnit.SECONDS);
+              if (!hev)
+                hp.destroy();
               println("Headless browser run completed, exit: " + hev);
             } catch (InterruptedException e) {
-              println(e.toString());
+              println("Headless browser error "+e.toString());
             }
           } catch (IOException e) {
-            println(e.toString());
+            println("Headless browser error "+e.toString());
           }
         }
       }