diff --git a/akonadi-server.changes b/akonadi-server.changes
index 4c079aa..09a67e1 100644
--- a/akonadi-server.changes
+++ b/akonadi-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 27 19:44:22 UTC 2016 - tittiatcoke@gmail.com
+
+- Add upstream patch fix-connect-api.patch in order to fix the 
+  subscribe/unsubscribe IMAP folders
+
 -------------------------------------------------------------------
 Tue Dec 13 19:27:48 UTC 2016 - tittiatcoke@gmail.com
 
diff --git a/akonadi-server.spec b/akonadi-server.spec
index bc21b59..6f665cc 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -17,18 +17,20 @@
 
 
 %define rname   akonadi
-Name:           akonadi-server
-Version:        16.12.0
-Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA)
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+Name:           akonadi-server
+Version:        16.12.0
+Release:        0
 Summary:        PIM Storage Service
 License:        LGPL-2.1+
 Group:          System/GUI/KDE
 Url:            http://akonadi-project.org
 Source:         %{rname}-%{version}.tar.xz
 Source99:       akonadi-server-rpmlintrc
+#PATCH-FIX-UPSTREAM fix-connect-api.patch  montel@kde.org
+Patch1:         fix-connect-api.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
@@ -39,6 +41,7 @@ BuildRequires:  libxslt
 BuildRequires:  libxslt-devel
 BuildRequires:  libxslt-tools
 BuildRequires:  mariadb
+BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  sqlite3-devel
@@ -146,6 +149,7 @@ Requires:       kxmlgui-devel
 Requires:       libKF5AkonadiAgentBase5 = %{version}
 Requires:       libKF5AkonadiCore5 = %{version}
 Requires:       libKF5AkonadiWidgets5 = %{version}
+Requires:       pkgconfig
 Requires:       solid-devel
 Requires:       pkgconfig(Qt5Network)
 Conflicts:      libakonadiprotocolinternals-devel
@@ -159,6 +163,7 @@ service.
 
 %prep
 %setup -q -n %{rname}-%{version}
+%patch1 -p1
 
 %build
   %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}
diff --git a/fix-connect-api.patch b/fix-connect-api.patch
new file mode 100644
index 0000000..8921b6e
--- /dev/null
+++ b/fix-connect-api.patch
@@ -0,0 +1,29 @@
+From 4f01df4db16331c8b0efd021135548507db3da0a Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Tue, 27 Dec 2016 13:33:15 +0100
+Subject: Fix subscript/unsubscript folder. We need to connect to private slot.
+
+it was a bug during porting to new connect api.
+Bug reported by Kevin
+
+CCMAIL:
+---
+ src/widgets/subscriptiondialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/subscriptiondialog.cpp b/src/widgets/subscriptiondialog.cpp
+index c922dc4..8ce06b9 100644
+--- a/src/widgets/subscriptiondialog.cpp
++++ b/src/widgets/subscriptiondialog.cpp
+@@ -223,7 +223,7 @@ void SubscriptionDialog::init(const QStringList &mimetypes)
+     mainLayout->addWidget(buttonBox);
+ 
+     connect(d->model, SIGNAL(loaded()), SLOT(modelLoaded()));
+-    connect(d->mOkButton, &QAbstractButton::clicked, this, &QDialog::done);
++    connect(d->mOkButton, SIGNAL(clicked(bool)), this, SLOT(done()));
+     connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &SubscriptionDialog::deleteLater);
+     ControlGui::widgetNeedsAkonadi(mainWidget);
+     d->readConfig();
+-- 
+cgit v0.11.2
+