diff --git a/0001-make-sure-scroll-views-are-pixel-aligned.patch b/0001-make-sure-scroll-views-are-pixel-aligned.patch
new file mode 100644
index 0000000..0a5cc4f
--- /dev/null
+++ b/0001-make-sure-scroll-views-are-pixel-aligned.patch
@@ -0,0 +1,30 @@
+From 2b3b1f8423018d764d21905a98ba1473592985bc Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 26 Nov 2018 14:33:52 +0100
+Subject: [PATCH] make sure scroll views are pixel aligned
+References: boo#1117346, kde#401174
+
+---
+ src/controls/templates/private/ScrollView.qml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: kirigami2-5.52.0/src/controls/templates/private/ScrollView.qml
+===================================================================
+--- kirigami2-5.52.0.orig/src/controls/templates/private/ScrollView.qml
++++ kirigami2-5.52.0/src/controls/templates/private/ScrollView.qml
+@@ -113,6 +113,7 @@ MouseArea {
+         //TODO: find a way to make flicking work on laptops with touch screen
+         flickableItem.interactive = Settings.tabletMode;
+         flickableItem.anchors.fill = flickableParent;
++        flickableItem.pixelAligned = true;
+ 
+         scrollBarCreationTimer.restart();
+     }
+@@ -162,6 +163,7 @@ MouseArea {
+             anchors {
+                 fill: parent
+             }
++            pixelAligned: true
+             contentWidth: root.contentItem ? root.contentItem.width : 0
+             contentHeight: root.contentItem ? root.contentItem.height : 0
+         }
diff --git a/kirigami2.changes b/kirigami2.changes
index a7209bd..4c7e74f 100644
--- a/kirigami2.changes
+++ b/kirigami2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 27 18:18:01 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Add patch to workaround visual glitches with unaligned text (boo#1117346, kde#401174):
+  * 0001-make-sure-scroll-views-are-pixel-aligned.patch
+
 -------------------------------------------------------------------
 Sun Nov 11 19:48:05 UTC 2018 - lbeltrame@kde.org
 
diff --git a/kirigami2.spec b/kirigami2.spec
index 2fe255e..083b501 100644
--- a/kirigami2.spec
+++ b/kirigami2.spec
@@ -31,6 +31,8 @@ License:        LGPL-2.1-or-later
 Group:          Development/Libraries/KDE
 URL:            https://www.kde.org
 Source:         https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-make-sure-scroll-views-are-pixel-aligned.patch
 BuildRequires:  extra-cmake-modules >= %{_tar_path}
 BuildRequires:  kf5-filesystem
 BuildRequires:  cmake(Qt5Core) >= 5.7.0
@@ -72,7 +74,7 @@ Development files.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build