diff --git a/srcpkgs/pandoc/files/pandoc-crossref.cabal b/srcpkgs/pandoc/files/pandoc-crossref.cabal
new file mode 100644
index 00000000000..7aacc47278f
--- /dev/null
+++ b/srcpkgs/pandoc/files/pandoc-crossref.cabal
@@ -0,0 +1,154 @@
+cabal-version: 2.0
+
+-- This file has been generated from package.yaml by hpack version 0.34.6.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 20655cd6263e9fe7e5737ee81b093c8c6f5eae67e260ddd3a821ac6ef5e35e69
+
+name:           pandoc-crossref
+version:        0.3.13.0
+synopsis:       Pandoc filter for cross-references
+description:    pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them.
+category:       Text
+homepage:       https://github.com/lierdakil/pandoc-crossref#readme
+bug-reports:    https://github.com/lierdakil/pandoc-crossref/issues
+author:         Nikolay Yakimov
+maintainer:     root@livid.pp.ru
+license:        GPL-2
+license-file:   LICENSE
+build-type:     Simple
+
+source-repository head
+  type: git
+  location: https://github.com/lierdakil/pandoc-crossref
+
+flag enable_flaky_tests
+  description: Some tests rely on specific behaviour of pandoc, which may change between minor versions. These are still useful indicators for the developer, but not necessarily indicating there's a problem with the package itself. Enable if you know what you are doing.
+  manual: True
+  default: False
+
+library
+  exposed-modules:
+      Text.Pandoc.CrossRef
+  other-modules:
+      Text.Pandoc.CrossRef.References
+      Text.Pandoc.CrossRef.References.Blocks
+      Text.Pandoc.CrossRef.References.List
+      Text.Pandoc.CrossRef.References.Refs
+      Text.Pandoc.CrossRef.References.Types
+      Text.Pandoc.CrossRef.Util.CodeBlockCaptions
+      Text.Pandoc.CrossRef.Util.CustomLabels
+      Text.Pandoc.CrossRef.Util.Meta
+      Text.Pandoc.CrossRef.Util.ModifyMeta
+      Text.Pandoc.CrossRef.Util.Options
+      Text.Pandoc.CrossRef.Util.Settings
+      Text.Pandoc.CrossRef.Util.Settings.Gen
+      Text.Pandoc.CrossRef.Util.Settings.Template
+      Text.Pandoc.CrossRef.Util.Template
+      Text.Pandoc.CrossRef.Util.Util
+  hs-source-dirs:
+      lib
+      lib-internal
+  ghc-options: -Wall
+  build-depends:
+      base >=4.11 && <5
+    , containers >=0.1 && <0.7
+    , data-default >=0.4 && <0.8
+    , directory >=1 && <1.4
+    , filepath >=1.1 && <1.5
+    , microlens >=0.4.12.0 && <0.5.0.0
+    , microlens-mtl >=0.2.0.1 && <0.3.0.0
+    , microlens-th >=0.4.3.10 && <0.5.0.0
+    , mtl >=1.1 && <2.3
+    , pandoc >=2.10 && <2.18
+    , pandoc-types >=1.21 && <1.23
+    , roman-numerals ==0.5.*
+    , syb >=0.4 && <0.8
+    , template-haskell >=2.7.0.0 && <3.0.0.0
+    , text >=1.2.2 && <1.3
+    , utility-ht >=0.0.11 && <0.1.0
+  default-language: Haskell2010
+
+executable pandoc-crossref
+  main-is: pandoc-crossref.hs
+  other-modules:
+      ManData
+  hs-source-dirs:
+      src
+  ghc-options: -Wall -threaded
+  build-depends:
+      base >=4.11 && <5
+    , deepseq ==1.4.*
+    , gitrev >=1.3.1 && <1.4
+    , open-browser ==0.2.*
+    , optparse-applicative >=0.13 && <0.17
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , template-haskell >=2.7.0.0 && <3.0.0.0
+    , temporary >=1.2 && <1.4
+    , text >=1.2.2 && <1.3
+  default-language: Haskell2010
+
+test-suite test-integrative
+  type: exitcode-stdio-1.0
+  main-is: test-integrative.hs
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , directory >=1 && <1.4
+    , filepath >=1.1 && <1.5
+    , hspec >=2.4.4 && <3
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  if flag(enable_flaky_tests)
+    cpp-options: -DFLAKY
+  default-language: Haskell2010
+
+test-suite test-pandoc-crossref
+  type: exitcode-stdio-1.0
+  main-is: test-pandoc-crossref.hs
+  other-modules:
+      Native
+      Paths_pandoc_crossref
+  autogen-modules:
+      Paths_pandoc_crossref
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , containers >=0.1 && <0.7
+    , data-default >=0.4 && <0.8
+    , hspec >=2.4.4 && <3
+    , microlens >=0.4.12.0 && <0.5.0.0
+    , mtl >=1.1 && <2.3
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  if flag(enable_flaky_tests)
+    cpp-options: -DFLAKY
+  default-language: Haskell2010
+
+benchmark simple
+  type: exitcode-stdio-1.0
+  main-is: bench-simple.hs
+  other-modules:
+      Native
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , criterion >=1.5.9.0 && <1.6
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  default-language: Haskell2010
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8628b1d1f3c..9bdf32ef3c5 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=3
-_sidenote_version=0.20.0.0
+version=2.17.1.1
+revision=1
+_sidenote_version=0.22.1.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 make_build_args="
- --flag pandoc:embed_data_files --flag=hslua:system-lua
- --flag=hslua:pkg-config"
+ --flag pandoc:embed_data_files
+ --flag=lua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
@@ -21,33 +21,28 @@ license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
-subpackages="pandoc-sidenote"
+ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz
+ https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz
+ https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
+checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1
+ c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
+subpackages="
+ pandoc-sidenote
+ pandoc-crossref"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-sidenote"
-
-# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683
-if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
-	distfiles+="
- https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz
- https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
-	checksum+="
- 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
- b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
-	nopie_files+="
+ /usr/bin/pandoc-sidenote
  /usr/bin/pandoc-crossref"
-	subpackages+="
- pandoc-crossref"
-fi
 
 post_extract() {
 	sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
 	sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
+	# See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586
+	cp "${FILESDIR}/pandoc-crossref.cabal" pandoc-crossref-${_crossref_version}
 }
 
 post_install() {