diff --git a/community/ghc/PKGBUILD b/community/ghc/PKGBUILD
index dd40ee55b..afa0731f7 100644
--- a/community/ghc/PKGBUILD
+++ b/community/ghc/PKGBUILD
@@ -17,7 +17,7 @@ shopt -s extglob
 
 pkgbase=ghc
 pkgname=(ghc-libs ghc ghc-static)
-pkgver=8.4.3
+pkgver=8.6.1
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('x86_64')
@@ -29,7 +29,7 @@ source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.x
         ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook
         0001-llvm-targets-Add-armv6l-unknown-linux-gnueabihf-and-.patch)
 noextract=("$pkgbase-${pkgver}-src.tar.xz")
-sha512sums=('c6cea84264f32ae888f9931f834a1d721889242f656d14262e787ec54a1793d1862ce76daacaf1006c12b8af12919501afce1dc02571373e24830e4d51803414'
+sha512sums=('7979273bbd190c92057638db7a4ebcf98d2a31beed71489b308590c0ca034cb7cc8ab7e688c3c3c51bcae84d03b836eb2054e9bed25d2f359aa04bcc49db863a'
             'afb119e4f665770c5704b97034d2488504eaa7afcddca2fb6b554079921cd2330599bcb5c36669f0d0e7856dd99ae1deeca1b0e97e2371a783f26e5ef9776ba9'
             'bd65a369b618ec9bee46c028c2b6acff8f883f60f6cad6e5be8561fbcef6118278abec11bb86f9e6f92cb2e05ad74ec54611c1788e8ed95187d0091fcbbf8767'
             'd4bfdd4c8ad9ac612cf187fec150850e9f4068a4a4202503c00dba07ba26f804bc11d7181249f7e3452d7ede60dc5dedea34e73fdb584ac2953068b51c6fd5ad'
@@ -106,33 +106,35 @@ package_ghc-libs() {
   install='ghc.install'
   depends=('gmp' 'libffi' 'perl' 'llvm50')
   provides=('haskell-array=0.5.2.0'
-            'haskell-base=4.11.1.0'
-            'haskell-binary=0.8.5.1'
+            'haskell-base=4.12.0.0'
+            'haskell-binary=0.8.6.0'
             'haskell-bytestring=0.10.8.2'
-            'haskell-containers=0.5.11.0'
-            'haskell-deepseq=1.4.3.0'
-            'haskell-directory=1.3.1.5'
-            'haskell-filepath=1.4.2'
-            'haskell-ghc-boot=8.4.3'
-            'haskell-ghc-boot-th=8.4.3'
+            'haskell-containers=0.6.0.1'
+            'haskell-deepseq=1.4.4.0'
+            'haskell-directory=1.3.3.0'
+            'haskell-filepath=1.4.2.1'
+            'haskell-ghc-boot=8.6.1'
+            'haskell-ghc-boot-th=8.6.1'
             'haskell-ghc-compact=0.1.0.0'
-            'haskell-ghc-prim=0.5.2.0'
-            'haskell-haskeline=0.7.4.2'
+            'haskell-ghc-heap=8.6.1'
+            'haskell-ghc-prim=0.5.3'
+            'haskell-haskeline=0.7.4.3'
             'haskell-hpc=0.6.0.3'
             'haskell-integer-gmp=1.0.2.0'
+            'haskell-libiserv=8.6.1'
             'haskell-mtl=2.2.2'
             'haskell-parsec=3.1.13.0'
             'haskell-pretty=1.1.3.6'
             'haskell-process=1.6.3.0'
-            'haskell-stm=2.4.5.0'
-            'haskell-template-haskell=2.13.0.0'
-            'haskell-terminfo=0.4.1.1'
-            'haskell-text=1.2.3.0'
+            'haskell-stm=2.5.0.0'
+            'haskell-template-haskell=2.14.0.0'
+            'haskell-terminfo=0.4.1.2'
+            'haskell-text=1.2.3.1'
             'haskell-time=1.8.0.2'
             'haskell-transformers=0.5.5.0'
             'haskell-unix=2.7.2.2'
             'haskell-xhtml=3000.2.2.1'
-            'haskell-cabal=2.2.0.1')
+            'haskell-cabal=2.4.0.1')
   replaces=('haskell-array'
             'haskell-base'
             'haskell-binary'
@@ -144,10 +146,12 @@ package_ghc-libs() {
             'haskell-ghc-boot'
             'haskell-ghc-boot-th'
             'haskell-ghc-compact'
+            'haskell-ghc-heap'
             'haskell-ghc-prim'
             'haskell-haskeline'
             'haskell-hpc'
             'haskell-integer-gmp'
+            'haskell-libiserv'
             'haskell-mtl'
             'haskell-parsec'
             'haskell-pretty'
diff --git a/community/ghc/ghc.install b/community/ghc/ghc.install
index 0062e4819..3be404b63 100644
--- a/community/ghc/ghc.install
+++ b/community/ghc/ghc.install
@@ -6,7 +6,7 @@ pre_upgrade() {
 
 post_upgrade() {
   if [[ ${1%-*} != ${2%-*} ]]; then
-    echo '==> All cabalized packages need to be reinstalled now.'
-    echo '==> See /usr/share/haskell/ for a tentative list of affected packages.'
+    echo '==> If you have custom packages installed, you will need to reinstall them now.'
+    echo "==> See /usr/lib/ghc-${2%-*}/package.conf.d/ for a tentative list of affected packages."
   fi
 }
diff --git a/community/ghc/print-provides-replaces.sh b/community/ghc/print-provides-replaces.sh
index 90f0c0f41..eafc946f4 100755
--- a/community/ghc/print-provides-replaces.sh
+++ b/community/ghc/print-provides-replaces.sh
@@ -22,7 +22,7 @@ cd src/ghc-${pkgver}/libraries
 # $1 is the name of the variable
 # $2 is the string for the test, either '=' or '<'
 print_var() {
-  printf "$1=("
+  printf "  $1=("
   for path in $(ls ./*/*.cabal); do
     dirname=$(echo $path | awk -F '/' '{ print $2 }')
     cabalfile=$(echo $path | awk -F '/' '{ print $3 }')
@@ -31,14 +31,13 @@ print_var() {
     version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path)
     printf "'haskell-$cabalname"
     [[ -n "$2" ]] && printf "$2$version"
-    printf "'\n          "
+    printf "'\n            "
   done
   # also add cabal
   version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
   printf "'haskell-cabal"
   [[ -n "$2" ]] && printf "$2$version"
-  printf "'\n          "
-  echo -e '\b)'
+  printf "')\n"
 }
 
 print_var 'provides' '='