diff --git a/Buildsystem/Configuration/ExternalSources/cryptominisat.mak b/Buildsystem/Configuration/ExternalSources/cryptominisat.mak
index 1c48034bef..84b645746f 100644
--- a/Buildsystem/Configuration/ExternalSources/cryptominisat.mak
+++ b/Buildsystem/Configuration/ExternalSources/cryptominisat.mak
@@ -5,7 +5,7 @@
 # the Free Software Foundation and included in this library; either version 3 of the
 # License, or any later version.
 
-# Settings for building and using CryptoMinisat
+# Settings for building and using CryptoMinisat2
 
 cryptominisat_recommended_version_number_okl ?= 2.9.6
 cryptominisat_other_versions_okl ?= 2.9.0
@@ -31,4 +31,44 @@ cryptominisat_docu_page_okl ?= $(doc_dir)/doxygen_html/
 
 cryptominisat_homepage_url_okl := http://www.msoos.org/cryptominisat2
 cryptominisat_documentation_url_okl := http://www.msoos.org/documentation/cryptominisat/
-cryptominisat_git_url_okl := git://gitorious.org/cryptominisat/cryptominisat.git
+cryptominisat_git_url_okl := git://github.com/msoos/cryptominisat.git
+
+
+# Settings for building and using CryptoMinisat3
+
+cryptominisat3_recommended_version_number_okl ?= 3.2.0
+cryptominisat3_other_versions_okl ?=
+
+cryptominisat3_base_name_okl := cryptoms
+cryptominisat3_recommended_okl := $(cryptominisat3_base_name_okl)-$(cryptominisat3_recommended_version_number_okl)
+cryptominisat3_source_okl := $(cryptominisat_base_source_okl)/$(cryptominisat3_recommended_okl)
+
+cryptominisat3_build_dir_okl ?= $(cryptominisat_base_build_dir_okl)/$(cryptominisat3_recommended_okl)
+
+cryptominisat3_installation_dir_okl ?= $(cryptominisat_base_installation_dir_okl)/$(cryptominisat3_recommended_version_number_okl)
+
+cryptominisat3_exec_okl ?= cryptominisat3
+cryptominisat3_call_okl ?= $(cryptominisat3_installation_dir_okl)/$(cryptominisat3_exec_okl)
+cryptominisat3_public_call_okl ?= $(cryptominisat3_exec_okl)
+
+
+# Settings for building and using tool M4RI (for CryptoMinisat3)
+
+m4ri_recommended_version_number_okl ?= 20130416
+m4ri_other_versions_okl ?=
+
+m4ri_base_name_okl := m4ri
+m4ri_recommended_okl := $(m4ri_base_name_okl)-$(m4ri_recommended_version_number_okl)
+m4ri_source_okl := $(cryptominisat_base_source_okl)/$(m4ri_recommended_okl)
+
+m4ri_build_dir_okl ?= $(cryptominisat_base_build_dir_okl)/$(m4ri_recommended_okl)
+
+m4ri_installation_dir_okl ?= $(cryptominisat_base_installation_dir_okl)/m4ri-$(m4ri_recommended_version_number_okl)
+
+m4ri_homepage_url_okl := http://m4ri.sagemath.org/
+m4ri_documentation_url_okl := http://m4ri.sagemath.org/m4ri-doxygen/index.html
+
+m4ri_source_library_okl ?= $(m4ri_installation_dir_okl)/include
+m4ri_include_option_okl ?= -I$(m4ri_source_library_okl)
+m4ri_link_library_okl ?= $(m4ri_installation_dir_okl)/lib
+m4ri_link_option_okl ?= -L$(m4ri_link_library_okl) -Wl,-rpath,$(m4ri_link_library_okl)
diff --git a/Buildsystem/ExternalSources/SpecialBuilds/cryptominisat.mak b/Buildsystem/ExternalSources/SpecialBuilds/cryptominisat.mak
index 1cd48182f5..d66f00ce6d 100644
--- a/Buildsystem/ExternalSources/SpecialBuilds/cryptominisat.mak
+++ b/Buildsystem/ExternalSources/SpecialBuilds/cryptominisat.mak
@@ -1,5 +1,5 @@
 # Matthew Gwynne, 7.1.2011 (Swansea)
-# Copyright 2011 Oliver Kullmann
+# Copyright 2011, 2013 Oliver Kullmann
 # This file is part of the OKlibrary. OKlibrary is free software; you can redistribute 
 # it and/or modify it under the terms of the GNU General Public License as published by
 # the Free Software Foundation and included in this library; either version 3 of the 
@@ -9,7 +9,7 @@
 # Directory Structure
 # ################################## 
 
-cryptominisat_directories_okl := $(cryptominisat_base_installation_dir_okl) $(cryptominisat_installation_dir_okl) $(cryptominisat_base_build_dir_okl) $(cryptominisat_base_doc_dir_okl) $(cryptominisat_doc_dir_okl)
+cryptominisat_directories_okl := $(cryptominisat_base_installation_dir_okl) $(cryptominisat_installation_dir_okl) $(cryptominisat_base_build_dir_okl) $(cryptominisat_base_doc_dir_okl) $(cryptominisat_doc_dir_okl) $(cryptominisat3_installation_dir_okl) $(m4ri_build_dir_okl) $(m4ri_installation_dir_okl)
 
 $(cryptominisat_directories_okl) : % : 
 	mkdir -p $@
@@ -19,7 +19,7 @@ $(cryptominisat_directories_okl) : % :
 # Main cryptominisat targets
 # #################################
 
-.PHONY : cryptominisat cryptominisat_doc cleancryptominisat cleanallcryptominisat
+.PHONY : cryptominisat cryptominisat_doc cleancryptominisat cleanallcryptominisat cryptominisat3 m4ri
 
 
 cryptominisat : $(cryptominisat_directories_okl)
@@ -31,8 +31,18 @@ cryptominisat : $(cryptominisat_directories_okl)
 	ln -s --force $(cryptominisat_call_okl) $(public_bin_dir_okl)/$(cryptominisat_public_call_okl); $(postcondition)
 
 
-cryptominisat_doc :
+cryptominisat3 : $(cryptominisat_base_build_dir_okl) $(cryptominisat3_installation_dir_okl) m4ri
+	$(call unarchive,$(cryptominisat3_source_okl),$(cryptominisat_base_build_dir_okl)) $(postcondition) \
+	cd $(cryptominisat3_build_dir_okl); $(postcondition) \
+	mkdir -p build; $(postcondition) \
+	cd build; $(postcondition) \
+	CC="$(gcc_call_okl) $(m4ri_include_option_okl)" CXX="$(gpp_call_okl) $(m4ri_include_option_okl)" LDFLAGS="$(gcc_linking_okl)" CMAKE_LIBRARY_PATH="$(boost_link_library_okl):$(zlib_link_library_okl):$(m4ri_link_library_okl)" CMAKE_INCLUDE_PATH="$(boost_source_library_okl):$(zlib_source_library_okl):$(m4ri_source_library_okl):$(CMAKE_INCLUDE_PATH)" M4RI_HOME="$(m4ri_installation_dir_okl)" cmake ../; $(postcondition) \
+	make; $(postcondition) \
+	cp -f cryptominisat $(cryptominisat3_call_okl); $(postcondition) \
+	ln -s --force $(cryptominisat3_call_okl) $(public_bin_dir_okl)/$(cryptominisat3_public_call_okl); $(postcondition)
+
 
+cryptominisat_doc :
 
 # #################################
 # Cleaning
@@ -43,3 +53,15 @@ cleancryptominisat :
 
 cleanallcryptominisat : cleancryptominisat
 	-rm -rf $(cryptominisat_base_installation_dir_okl) $(cryptominisat_base_doc_dir_okl)
+
+
+# #################################
+# M4RI tool targets
+# #################################
+
+m4ri : $(m4ri_directories_okl)
+	$(call unarchive,$(m4ri_source_okl),$(cryptominisat_base_build_dir_okl)) $(postcondition) \
+	cd $(m4ri_build_dir_okl); $(postcondition) \
+	CC="$(gcc_call_okl)" CXX="$(gpp_call_okl)" LDFLAGS="$(gcc_linking_okl)" ./configure --prefix="$(m4ri_installation_dir_okl)"; $(postcondition) \
+	make; $(postcondition) \
+	make install; $(postcondition)
diff --git a/Buildsystem/ExternalSources/sources/SAT/CryptoMiniSat/cryptoms-3.2.0.tar.bz2.md5sum b/Buildsystem/ExternalSources/sources/SAT/CryptoMiniSat/cryptoms-3.2.0.tar.bz2.md5sum
new file mode 100644
index 0000000000..792fff6dd7
--- /dev/null
+++ b/Buildsystem/ExternalSources/sources/SAT/CryptoMiniSat/cryptoms-3.2.0.tar.bz2.md5sum
@@ -0,0 +1 @@
+fbc03bfa6f51bf23e862fd577252c967
diff --git a/Buildsystem/ExternalSources/sources/SAT/CryptoMiniSat/m4ri-20130416.tar.gz.md5sum b/Buildsystem/ExternalSources/sources/SAT/CryptoMiniSat/m4ri-20130416.tar.gz.md5sum
new file mode 100644
index 0000000000..633ba399d5
--- /dev/null
+++ b/Buildsystem/ExternalSources/sources/SAT/CryptoMiniSat/m4ri-20130416.tar.gz.md5sum
@@ -0,0 +1 @@
+b889260fd9d0d5e88c5eba26b5c9ad14