diff --git a/system/installer/Calamares/files/pisi_locale.patch b/system/installer/Calamares/files/pisi_locale.patch
index 0b6c04d074..8e234100fa 100644
--- a/system/installer/Calamares/files/pisi_locale.patch
+++ b/system/installer/Calamares/files/pisi_locale.patch
@@ -1,21 +1,12 @@
---- calamares-2.2.orig/src/modules/locale/LocalePage.cpp	2015-08-06 12:58:34.000000000 +0300
-+++ calamares-2.2/src/modules/locale/LocalePage.cpp	2016-05-18 10:19:14.271694185 +0300
-@@ -240,7 +240,7 @@
-                  << ". Assuming the supported languages are already built into "
-                     "the locale archive.";
-         QProcess localeA;
--        localeA.start( "locale", QStringList() << "-a" );
-+        localeA.start( "cat", QStringList() << "/etc/languages" );
-         localeA.waitForFinished();
-         ba = localeA.readAllStandardOutput();
-     }
---- calamares-2.2.orig/src/modules/localecfg/main.py	2015-10-16 17:56:51.000000000 +0300
-+++ calamares-2.2/src/modules/localecfg/main.py	2016-05-18 10:19:38.315696547 +0300
-@@ -67,6 +67,6 @@
- 
-     with open(locale_conf_path, "w") as locale_conf:
-         locale_split = locale.split(' ')[0]
--        locale_conf.write("LANG={!s}\n".format(locale_split))
-+        locale_conf.write("{!s}\n".format(locale_split))
- 
-     return None
+diff -Nuar a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
+--- a/src/modules/locale/LocalePage.cpp	2017-10-23 23:22:25.000000000 +0300
++++ b/src/modules/locale/LocalePage.cpp	2017-11-05 16:41:49.935761099 +0300
+@@ -320,7 +320,7 @@
+                      << ". Assuming the supported languages are already built into "
+                         "the locale archive.";
+             QProcess localeA;
+-            localeA.start( "locale", QStringList() << "-a" );
++            localeA.start( "cat", QStringList() << "/etc/languages" );
+             localeA.waitForFinished();
+             ba = localeA.readAllStandardOutput();
+         }
diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml
index 83cad370ca..ce07538ee1 100644
--- a/system/installer/Calamares/pspec.xml
+++ b/system/installer/Calamares/pspec.xml
@@ -11,7 +11,7 @@
         <License>LGPLv2</License>
         <Summary>A distribution independent installer framework</Summary>
         <Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
-        <Archive sha1sum="73f876bce31cd48d899154173a684520229506da" type="targz">https://sourceforge.net/projects/pisi-source/files/calamares-2.4.83.tar.gz</Archive>
+        <Archive sha1sum="32a9a6c994f3f7e403c4873715f10d1357430aa7" type="targz">https://github.com/calamares/calamares/releases/download/v3.1.7/calamares-3.1.7.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gettext-devel</Dependency>
             <Dependency>yaml-cpp</Dependency>
@@ -115,6 +115,13 @@
     </Package>
     
     <History>
+        <Update release="5">
+            <Date>2016-12-13</Date>
+            <Version>3.1.7</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2016-12-13</Date>
             <Version>2.4.83</Version>