diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f6a6d1e0..68de20aba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -722,8 +722,6 @@ katie_generate_obsolete(QTextBlock QtGui qtextobject.h)
 katie_generate_obsolete(QTextBlockUserData QtGui qtextobject.h)
 katie_generate_obsolete(QTextCharFormat QtGui qtextformat.h)
 katie_generate_obsolete(QTextConverter QtCore qtextcodec.h)
-katie_generate_obsolete(QTextDecoder QtCore qtextcodec.h)
-katie_generate_obsolete(QTextEncoder QtCore qtextcodec.h)
 katie_generate_obsolete(QTextFragment QtGui qtextobject.h)
 katie_generate_obsolete(QTextFrameFormat QtGui qtextformat.h)
 katie_generate_obsolete(QTextFrameLayoutData QtGui qtextobject.h)
diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
index e03b524b2..ce29da4d4 100644
--- a/package/archlinux/PKGBUILD
+++ b/package/archlinux/PKGBUILD
@@ -3,7 +3,7 @@
 # https://wiki.archlinux.org/index.php/Arch_package_guidelines
 
 pkgname=katie-git
-pkgver=4.12.0.r7752.385e7a50f
+pkgver=4.12.0.r7788.ac19ddd82
 pkgrel=1
 pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
 arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm')
diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist
index a72715abd..324d84028 100644
--- a/package/freebsd/pkg-plist
+++ b/package/freebsd/pkg-plist
@@ -136,8 +136,6 @@ include/katie/QtCore/QTemporaryFile
 include/katie/QtCore/QTextBoundaryFinder
 include/katie/QtCore/QTextCodec
 include/katie/QtCore/QTextConverter
-include/katie/QtCore/QTextDecoder
-include/katie/QtCore/QTextEncoder
 include/katie/QtCore/QTextStream
 include/katie/QtCore/QTextStreamFunction
 include/katie/QtCore/QTextStreamManipulator
diff --git a/scripts/incfsck.py b/scripts/incfsck.py
index eab151e35..b03434778 100755
--- a/scripts/incfsck.py
+++ b/scripts/incfsck.py
@@ -68,8 +68,6 @@ incmap = {
         'QStringListIterator': 'qstringlist.h',
         'QStringRef': 'qstring.h',
         'QTextConverter': 'qtextcodec.h',
-        'QTextDecoder': 'qtextcodec.h',
-        'QTextEncoder': 'qtextcodec.h',
         'QTextStreamFunction': 'qtextstream.h',
         'QTextStreamManipulator': 'qtextstream.h',
         'QTime': 'qdatetime.h',
diff --git a/scripts/namefsck.py b/scripts/namefsck.py
index 64c72b872..0ccb2f1ad 100755
--- a/scripts/namefsck.py
+++ b/scripts/namefsck.py
@@ -537,12 +537,10 @@ classlist = [
     "QTextCodec",
     "QTextConverter",
     "QTextCursor",
-    "QTextDecoder",
     "QTextDocument",
     "QTextDocumentFragment",
     "QTextDocumentWriter",
     "QTextEdit",
-    "QTextEncoder",
     "QTextFormat",
     "QTextFragment",
     "QTextFrame",
diff --git a/src/core/io/qtextstream.h b/src/core/io/qtextstream.h
index 815200179..0a4ea818a 100644
--- a/src/core/io/qtextstream.h
+++ b/src/core/io/qtextstream.h
@@ -30,7 +30,6 @@
 QT_BEGIN_NAMESPACE
 
 class QTextCodec;
-class QTextDecoder;
 
 class QTextStreamPrivate;
 class Q_CORE_EXPORT QTextStream                                // text stream class
diff --git a/src/xml/kernel/qxmlstream.g b/src/xml/kernel/qxmlstream.g
index ddfd8cff5..af9ee8617 100644
--- a/src/xml/kernel/qxmlstream.g
+++ b/src/xml/kernel/qxmlstream.g
@@ -269,7 +269,7 @@ public:
     bool deleteDevice;
 #ifndef QT_NO_TEXTCODEC
     QTextCodec *codec;
-    QTextDecoder *decoder;
+    QTextConverter *decoder;
 #endif
     bool atEnd;