diff --git a/math/boolector/Makefile b/math/boolector/Makefile
index 34dec98a62b2..dd633727c480 100644
--- a/math/boolector/Makefile
+++ b/math/boolector/Makefile
@@ -1,9 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	boolector
-DISTVERSION=	3.0.0-239
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g0b4b8540
+DISTVERSION=	3.1.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,8 +10,10 @@ COMMENT=	Satisfiability Modulo Theories (SMT) solver
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	picosat>0:math/picosat
-LIB_DEPENDS=	libbtor2parser.so:math/btor2tools
+BUILD_DEPENDS=	cadical>0:math/cadical
+LIB_DEPENDS=	libbtor2parser.so:math/btor2tools \
+		libminisat.so:math/minisat \
+		libpicosat.so:math/picosat
 
 USES=		cmake:noninja compiler:c++11-lang # ninja fails to build tests
 USE_GITHUB=	yes
diff --git a/math/boolector/distinfo b/math/boolector/distinfo
index 09b0ae2360a7..e5187876dc29 100644
--- a/math/boolector/distinfo
+++ b/math/boolector/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560489123
-SHA256 (Boolector-boolector-3.0.0-239-g0b4b8540_GH0.tar.gz) = f0de750314c8075f6adb9f88a72c7efb897e52d53dc06b41b9beceec0f163765
-SIZE (Boolector-boolector-3.0.0-239-g0b4b8540_GH0.tar.gz) = 1372029
+TIMESTAMP = 1575434687
+SHA256 (Boolector-boolector-3.1.0_GH0.tar.gz) = 0c799f4e835e7f20ae7ecf7c3c8a99b9638b01cfe7b7f5dd1bc93ac478a0b06c
+SIZE (Boolector-boolector-3.1.0_GH0.tar.gz) = 1548782
diff --git a/math/boolector/files/patch-CMakeLists.txt b/math/boolector/files/patch-CMakeLists.txt
index 5099df59aca0..c638199bd96e 100644
--- a/math/boolector/files/patch-CMakeLists.txt
+++ b/math/boolector/files/patch-CMakeLists.txt
@@ -1,17 +1,28 @@
---- CMakeLists.txt.orig	2019-05-30 02:33:58 UTC
+--- CMakeLists.txt.orig	2019-12-02 22:50:20 UTC
 +++ CMakeLists.txt
-@@ -402,11 +402,15 @@ configure_file(
-   ${CMAKE_CURRENT_BINARY_DIR}/src/btorconfig.h)
+@@ -434,20 +434,24 @@ configure_file(
+ # Regression tests
  
- # Enable CTest
+ # Get and configure google test
 +if (BUILD_TESTING)
- enable_testing()
+ include(cmake/googletest.cmake)
+ fetch_googletest(
+     ${PROJECT_SOURCE_DIR}/cmake
+     ${PROJECT_BINARY_DIR}/googletest
+     )
+ 
+-enable_testing()
++  enable_testing()
 +endif(BUILD_TESTING)
  
+ #-----------------------------------------------------------------------------#
+ # Source directories
+ 
  include_directories(src ${CMAKE_CURRENT_BINARY_DIR}/src)
  add_subdirectory(src)
+-add_subdirectory(test)
 +if (BUILD_TESTING)
- add_subdirectory(test)
++  add_subdirectory(test)
 +endif(BUILD_TESTING)
  if(PYTHON)
    add_subdirectory(src/api/python)
diff --git a/math/boolector/files/patch-src_CMakeLists.txt b/math/boolector/files/patch-src_CMakeLists.txt
index 511a0bfbd2d0..ffb9a81f88f6 100644
--- a/math/boolector/files/patch-src_CMakeLists.txt
+++ b/math/boolector/files/patch-src_CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2019-06-14 07:01:21 UTC
+--- src/CMakeLists.txt.orig	2019-12-04 04:46:17 UTC
 +++ src/CMakeLists.txt
-@@ -129,7 +129,7 @@ set_target_properties(boolector-bin
-   PROPERTIES
-     OUTPUT_NAME boolector
-     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
--if(NOT SHARED AND NOT APPLE)
-+if(NOT SHARED AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-   set_target_properties(boolector-bin
-     PROPERTIES
-       LINK_FLAGS "-static -Wl,--no-export-dynamic"
+@@ -195,7 +195,7 @@ target_link_libraries(btorimc boolector)
+ #-----------------------------------------------------------------------------#
+ # Static binaries
+ 
+-if(NOT BUILD_SHARED_LIBS AND NOT APPLE)
++if(NOT BUILD_SHARED_LIBS AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+   set(BTOR_STATIC_FLAGS "-static")
+   set(STATIC_TARGETS boolector-bin btormc btoruntrace btorimc)
+ 
diff --git a/math/boolector/pkg-plist b/math/boolector/pkg-plist
index db5caf1e44a8..c003607e79ca 100644
--- a/math/boolector/pkg-plist
+++ b/math/boolector/pkg-plist
@@ -6,4 +6,4 @@ lib/cmake/Boolector/BoolectorConfig.cmake
 lib/cmake/Boolector/BoolectorConfigVersion.cmake
 lib/cmake/Boolector/BoolectorTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Boolector/BoolectorTargets.cmake
-lib/libboolector.a
+lib/libboolector.so