diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java
index fe018feef..766faa5d6 100644
--- a/core/java/src/freenet/support/CPUInformation/CPUID.java
+++ b/core/java/src/freenet/support/CPUInformation/CPUID.java
@@ -55,6 +55,7 @@ public class CPUID {
     private static final boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux");
     private static final boolean isFreebsd = System.getProperty("os.name").toLowerCase().contains("freebsd");
     private static final boolean isNetbsd = System.getProperty("os.name").toLowerCase().contains("netbsd");
+    private static final boolean isOpenbsd = System.getProperty("os.name").toLowerCase().contains("openbsd");
     private static final boolean isSunos = System.getProperty("os.name").toLowerCase().contains("sunos");
     private static final boolean isMac = System.getProperty("os.name").startsWith("Mac");
 
@@ -443,6 +444,8 @@ public class CPUID {
             return "jcpuid-x86-freebsd"; // The convention on freebsd...
         if(isNetbsd)
             return "jcpuid-x86-netbsd"; // The convention on netbsd...
+        if(isOpenbsd)
+            return "jcpuid-x86-openbsd"; // The convention on openbsd...
         if(isSunos)
             return "jcpuid-x86-solaris"; // The convention on SunOS
         //throw new RuntimeException("Dont know jcpuid library name for os type '"+System.getProperty("os.name")+"'");
@@ -458,6 +461,8 @@ public class CPUID {
             return "jcpuid-x86_64-freebsd";
         if(isNetbsd)
             return "jcpuid-x86_64-netbsd";
+        if(isOpenbsd)
+            return "jcpuid-x86_64-openbsd";
 	if(isMac){
 	    if(isX86){
 	        return "jcpuid-x86_64-osx";
diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index 5379c4bd6..1f0ecc770 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -158,6 +158,7 @@ public class NativeBigInteger extends BigInteger {
     private static final boolean _isLinux = System.getProperty("os.name").toLowerCase().contains("linux");
     private static final boolean _isFreebsd = System.getProperty("os.name").toLowerCase().contains("freebsd");
     private static final boolean _isNetbsd = System.getProperty("os.name").toLowerCase().contains("netbsd");
+    private static final boolean _isOpenbsd = System.getProperty("os.name").toLowerCase().contains("openbsd");
     private static final boolean _isSunos = System.getProperty("os.name").toLowerCase().contains("sunos");
     private static final boolean _isAndroid = System.getProperty("java.vendor").contains("Android");
 
@@ -759,6 +760,8 @@ public class NativeBigInteger extends BigInteger {
             return "jbigi-freebsd-";
         if(_isNetbsd)
             return "jbigi-netbsd-";
+        if(_isOpenbsd)
+            return "jbigi-openbsd-";
         if(_isMac)
             return "jbigi-osx-";
         if(_isOS2)
diff --git a/history.txt b/history.txt
index 87aaaf171..4cd8179e9 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,5 @@
 2011-09-18 kytv
- * Add NetBSD to NBI and CPUID
+ * Add OpenBSD & NetBSD to NBI and CPUID
 
 2011-09-16 zzz
   * Console: Home page flag spacing