diff --git a/config.h b/config.h
index c02f7abb8d..1d6f5a3020 100644
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* enable cuckoo */
+/* enable cuckoo module */
 #define CUCKOO 1
 
 /* enable dmalloc */
@@ -19,6 +19,9 @@
 /* Define to 1 if you have the `jansson' library (-ljansson). */
 #define HAVE_LIBJANSSON 1
 
+/* Define to 1 if you have the `magic' library (-lmagic). */
+/* #undef HAVE_LIBMAGIC */
+
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #define HAVE_LIBPTHREAD 1
 
@@ -50,6 +53,9 @@
    */
 #define LT_OBJDIR ".libs/"
 
+/* enable magic module */
+/* #undef MAGIC */
+
 /* Name of package */
 #define PACKAGE "yara"
 
@@ -60,19 +66,19 @@
 #define PACKAGE_NAME "yara"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yara 3.0"
+#define PACKAGE_STRING "yara 3.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yara"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0"
+#define PACKAGE_VERSION "3.1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "3.0"
+#define VERSION "3.1"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
diff --git a/configure.ac b/configure.ac
index d72c8d5f74..313c247e3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([yara], [3.0], [vmalvarez@virustotal.com])
+AC_INIT([yara], [3.1], [vmalvarez@virustotal.com])
 
 AC_CONFIG_SRCDIR([yara.c])
 
diff --git a/libyara/Makefile.am b/libyara/Makefile.am
index caf4b2c774..67c07d022f 100644
--- a/libyara/Makefile.am
+++ b/libyara/Makefile.am
@@ -47,7 +47,7 @@ yarainclude_HEADERS = \
 
 lib_LTLIBRARIES = libyara.la
 
-libyara_la_LDFLAGS = -export-symbols libyara.sym -version-number 3:0
+libyara_la_LDFLAGS = -export-symbols libyara.sym -version-number 3:1
 
 libyara_la_SOURCES = \
   $(MODULES) \
diff --git a/yara-python/setup.py b/yara-python/setup.py
index e5e99c9d62..ef2a1b11a8 100644
--- a/yara-python/setup.py
+++ b/yara-python/setup.py
@@ -17,7 +17,7 @@
 from distutils.core import setup, Extension
 
 setup(name='yara-python',
-      version='3.0',
+      version='3.1',
       author='Victor M. Alvarez',
       author_email='plusvic@gmail.com;vmalvarez@virustotal.com',
       ext_modules=[Extension(
diff --git a/yara-python/setupwin32.py b/yara-python/setupwin32.py
index 5b7be3e688..403e665b0e 100644
--- a/yara-python/setupwin32.py
+++ b/yara-python/setupwin32.py
@@ -17,7 +17,7 @@
 from distutils.core import setup, Extension
 
 setup(name='yara-python',
-      version='3.0',
+      version='3.1',
       author='Victor M. Alvarez',
       author_email='plusvic@gmail.com;vmalvarez@virustotal.com',
       ext_modules=[Extension(
diff --git a/yara-python/setupwin64.py b/yara-python/setupwin64.py
index 9152fd510c..cdb76214ea 100644
--- a/yara-python/setupwin64.py
+++ b/yara-python/setupwin64.py
@@ -17,7 +17,7 @@
 from distutils.core import setup, Extension
 
 setup(name='yara-python',
-      version='3.0',
+      version='3.1',
       author='Victor M. Alvarez',
       author_email='plusvic@gmail.com;vmalvarez@virustotal.com',
       ext_modules=[Extension(