diff --git a/NEWS.txt b/NEWS.txt
index c7784dfb4dd6bd99654d5a0764f3451bf2b696c1..77b01edc755b709434f9dcc5007e66f6ffa2dcec 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,14 @@
+---------------- VERSION 4.12.1 --------------
+C/C++:
+- Bug fixes from Luis Nassif and Joachim Metz
+- Added check to stop for very large folders to prevent memory exhausion
+
+Java:
+- Added File Repository concept for files to be stored in another location
+- Schema updated to 9.4
+- Fixed OS Account merge bug and now fire events when accounts are merged
+
+
---------------- VERSION 4.12.0 --------------
- There was a 1-year gap since 4.11.1 and the git log has 441 commits in that timeframe.
- Many for small fixes.
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index 2893c94d14e3d239641c7507c4ae9e95db004131..2cb327329a73a199df5e1be71766de8ea54e99da 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -11,7 +11,7 @@
<import file="build-${os.family}.xml"/>
<!-- Careful changing this because release-windows.pl updates it by pattern -->
-<property name="VERSION" value="4.12.0"/>
+<property name="VERSION" value="4.12.1"/>
<!-- set global properties for this build -->
<property name="default-jar-location" location="/usr/share/java"/>
diff --git a/bindings/java/doxygen/Doxyfile b/bindings/java/doxygen/Doxyfile
index f0e8734ea9aa7e1e84b31fb9d63c3fc87f9bea7f..6da9ad6abb31e6fff81e6f7d98ad4dc27260ecc4 100644
--- a/bindings/java/doxygen/Doxyfile
+++ b/bindings/java/doxygen/Doxyfile
@@ -39,7 +39,7 @@ PROJECT_NAME = "Sleuth Kit Java Bindings (JNI)"
# control system is used.
# NOTE: This is updated by the release-unix.pl script
-PROJECT_NUMBER = 4.12.0
+PROJECT_NUMBER = 4.12.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -1056,7 +1056,7 @@ GENERATE_HTML = YES
# This tag requires that the tag GENERATE_HTML is set to YES.
# NOTE: This is updated by the release-unix.pl script
-HTML_OUTPUT = jni-docs/4.12.0/
+HTML_OUTPUT = jni-docs/4.12.1/
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
# generated HTML page (for example: .htm, .php, .asp).
diff --git a/case-uco/java/nbproject/project.properties b/case-uco/java/nbproject/project.properties
index 8c271ded33cee8bb7e33ca5be892709eeff03d49..cf6949fec42ecff63c68feffec45a069ee0ab6b7 100644
--- a/case-uco/java/nbproject/project.properties
+++ b/case-uco/java/nbproject/project.properties
@@ -35,7 +35,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.gson-2.8.5.jar=lib/gson-2.8.5.jar
-file.reference.sleuthkit-4.12.0.jar=lib/sleuthkit-4.12.0.jar
+file.reference.sleuthkit-4.12.1.jar=lib/sleuthkit-4.12.1.jar
file.reference.junit-4.12.jar=lib/junit-4.12.jar
file.reference.hamcrest-core-1.3.jar=lib/hamcrest-core-1.3.jar
includes=**
@@ -44,7 +44,7 @@ jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
${file.reference.gson-2.8.5.jar}:\
-${file.reference.sleuthkit-4.12.0.jar}
+${file.reference.sleuthkit-4.12.1.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint
javac.deprecation=false
diff --git a/configure.ac b/configure.ac
index c4226f5be45a89e0bdfd4f990e86555e4e522191..7d72d4642d981da7d969f868a5926eb2f6c809c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(sleuthkit, 4.12.0)
+AC_INIT(sleuthkit, 4.12.1)
m4_include([m4/ax_pthread.m4])
dnl include the version from 1.12.1. This will work for
m4_include([m4/cppunit.m4])
diff --git a/debian/changelog b/debian/changelog
index 380f6429cb71a668c83039ed49d84136efadc0a6..37552b6276e410f3b824c25a9f41671c7f39e295 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sleuthkit-java (4.12.0-1) unstable; urgency=medium
+sleuthkit-java (4.12.1-1) unstable; urgency=medium
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
diff --git a/debian/sleuthkit-java.install b/debian/sleuthkit-java.install
index 5c51f709b582671e9265497572e67c10102f3f36..f8e918ee58204c14ef434f1f7511fa0e70453169 100644
--- a/debian/sleuthkit-java.install
+++ b/debian/sleuthkit-java.install
@@ -1,4 +1,4 @@
bindings/java/lib/sqlite-jdbc-3.42.0.0.jar /usr/share/java
-bindings/java/dist/sleuthkit-4.12.0.jar /usr/share/java
-case-uco/java/dist/sleuthkit-caseuco-4.12.0.jar /usr/share/java
+bindings/java/dist/sleuthkit-4.12.1.jar /usr/share/java
+case-uco/java/dist/sleuthkit-caseuco-4.12.1.jar /usr/share/java
diff --git a/packages/sleuthkit.spec b/packages/sleuthkit.spec
index 02ff18a5e4c3b3849dfefd8acfbe5c3be60dd8e7..33d0f73a2705cc9da41cdb5728b272052a8c2b5e 100644
--- a/packages/sleuthkit.spec
+++ b/packages/sleuthkit.spec
@@ -1,5 +1,5 @@
Name: sleuthkit
-Version: 4.12.0
+Version: 4.12.1
Release: 1%{?dist}
Summary: The Sleuth Kit (TSK) is a library and collection of command line tools that allow you to investigate volume and file system data.
diff --git a/tsk/Makefile.am b/tsk/Makefile.am
index 246d3283478df3fd27a18d8ca47b89b54406fa2b..278f064e77c4268a4c0c901bb85e0e03862733d6 100644
--- a/tsk/Makefile.am
+++ b/tsk/Makefile.am
@@ -8,7 +8,7 @@ libtsk_la_LIBADD = base/libtskbase.la img/libtskimg.la \
vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la \
auto/libtskauto.la pool/libtskpool.la util/libtskutil.la
# current:revision:age
-libtsk_la_LDFLAGS = -version-info 21:0:2 $(LIBTSK_LDFLAGS)
+libtsk_la_LDFLAGS = -version-info 21:1:2 $(LIBTSK_LDFLAGS)
EXTRA_DIST = tsk_tools_i.h docs/Doxyfile docs/*.dox docs/*.html \
tsk.pc.in
diff --git a/tsk/base/tsk_base.h b/tsk/base/tsk_base.h
index 83fa3d71676cbc8228fb945b756921e29567de33..bc14675d6336c22034de465f48c1062a41d10cf8 100644
--- a/tsk/base/tsk_base.h
+++ b/tsk/base/tsk_base.h
@@ -39,11 +39,11 @@
* 3.1.2b1 would be 0x03010201. Snapshot from Jan 2, 2003 would be
* 0xFF030102.
* See TSK_VERSION_STR for string form. */
-#define TSK_VERSION_NUM 0x041200ff
+#define TSK_VERSION_NUM 0x041201ff
/** Version of code in string form. See TSK_VERSION_NUM for
* integer form. */
-#define TSK_VERSION_STR "4.12.0"
+#define TSK_VERSION_STR "4.12.1"
/* include the TSK-specific header file that we created in autoconf
diff --git a/tsk/docs/Doxyfile b/tsk/docs/Doxyfile
index 2fb2fa52220e4b53fd2607f917b396553dc7c299..ca6854ba0bbb0538581db14de1fee102033a519d 100644
--- a/tsk/docs/Doxyfile
+++ b/tsk/docs/Doxyfile
@@ -33,7 +33,7 @@ PROJECT_NAME = "The Sleuth Kit"
# if some version control system is used.
# This is automatically updated at release time.
-PROJECT_NUMBER = 4.12.0
+PROJECT_NUMBER = 4.12.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
@@ -884,7 +884,7 @@ GENERATE_HTML = YES
# put in front of it. If left blank `html' will be used as the default path.
# NOTE: This is automatically updated at release time.
-HTML_OUTPUT = api-docs/4.12.0/
+HTML_OUTPUT = api-docs/4.12.1/
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank