diff --git a/20201107.tar.gz b/20201107.tar.gz
new file mode 100644
index 0000000..32419e2
--- /dev/null
+++ b/20201107.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c
+size 19485522
diff --git a/fix-glossary.patch b/fix-glossary.patch
deleted file mode 100644
index f6c5a5e..0000000
--- a/fix-glossary.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 558aa0418f20f411c58997aaa4fdbe5fcab07fd9 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Sat, 18 Apr 2020 11:42:24 +1000
-Subject: Fix sphinx terms and disable appveyor spam
-
-See also sphinx-doc/sphinx#7418
----
- doc/sphinx/glossary.rst | 78 ++++++++++++++++++++---------------------
- 2 files changed, 44 insertions(+), 44 deletions(-)
-
-diff --git a/doc/sphinx/glossary.rst b/doc/sphinx/glossary.rst
-index 9a9f4f8630..b53ed2369e 100644
---- a/doc/sphinx/glossary.rst
-+++ b/doc/sphinx/glossary.rst
-@@ -23,13 +23,13 @@ Typographical glossary
-       Both Hebrew and Arabic have optional vowel marks and are called "impure"
-       abjads. Ancient Phoenician had nothing but consonants and is a "pure" abjad.
- 
--      See Also: :term:`alphabet`,
--      :term:`abugida`, :term:`syllabary` and
-+      See Also: :term:`Alphabet`,
-+      :term:`Abugida`, :term:`Syllabary` and
-       the relevant `Wikipedia article <http://en.wikipedia.org/wiki/Abjad>`__.
- 
-    Abugida
--      An abugida is somewhere in between an :term:`alphabet` and
--      a :term:`syllabary`. The Indic writing systems are
-+      An abugida is somewhere in between an :term:`alphabet <Alphabet>` and
-+      a :term:`syllabary <Syllabary>`. The Indic writing systems are
-       probably the best known abugidas.
- 
-       In most abugidas there are independant glyphs for the consonants, and each
-@@ -45,8 +45,8 @@ Typographical glossary
-       An abugida differs from an abjad in that vowels (other than the default) must
-       be marked in the abugida.
- 
--      See Also: :term:`alphabet`, :term:`abjad`,
--      :term:`syllabary` and the relevant
-+      See Also: :term:`Alphabet`, :term:`Abjad`,
-+      :term:`Syllabary` and the relevant
-       `Wikipedia article <http://en.wikipedia.org/wiki/Abugida>`__.
- 
-    Advance Width
-@@ -62,8 +62,8 @@ Typographical glossary
-       vowels alike -- and (in theory anyway) all phonemes in a word will be marked
-       by an appropriate glyph.
- 
--      See Also: :term:`abjad`, :term:`abugida`,
--      :term:`syllabary` and the relevant
-+      See Also: :term:`Abjad`, :term:`Abugida`,
-+      :term:`Syllabary` and the relevant
-       `Wikipedia article <http://en.wikipedia.org/wiki/Alphabet>`__.
- 
-    Apple Advanced Typography
-@@ -83,7 +83,7 @@ Typographical glossary
- 
-    Ascent
-       In traditional typography the ascent of a font was the distance from the top
--      of a block of type to the :term:`baseline`.
-+      of a block of type to the :term:`baseline <Baseline>`.
- 
-       Its precise meaning in modern typography seems to vary with different
-       definers.
-@@ -127,7 +127,7 @@ Typographical glossary
-    Black letter
-       Any of various type families based on medieval handwriting.
- 
--      See also :term:`gothic`.
-+      See also :term:`Gothic`.
- 
-    BMP
-    Basic Multilingual Plane
-@@ -142,13 +142,13 @@ Typographical glossary
-         (0xE0000-0xEFFFF)
- 
-    Bold
--      A common font :term:`style`. The stems of the glyphs are
-+      A common font :term:`style <Style>`. The stems of the glyphs are
-       wider than in the normal font, giving the letters a darker impression. Bold
-       is one of the few :term:`LGC` styles that translate readily to
-       other scripts.
- 
-    Bopomofo
--      A (modern~1911) Chinese (Mandarin) :term:`alphabet` used
-+      A (modern~1911) Chinese (Mandarin) :term:`alphabet <Alphabet>` used
-       to provide phonetic transliteration of Han ideographs in dictionaries.
- 
-    Boustrophedon
-@@ -158,7 +158,7 @@ Typographical glossary
-       Writing "as the ox plows", that is alternating between left to right and
-       right to left writing directions. Early alphabets (Old Canaanite, and the
-       very early greek writings (and, surprisingly,
--      :term:`fuþark`)) used this. Often the right to left glyphs
-+      :term:`Fuþark`)) used this. Often the right to left glyphs
-       would be mirrors of the left to right ones. As far as I know, no modern
-       writing system uses this method (nor does OpenType have any support for it).
-       See Also :term:`Bidi`.
-@@ -181,7 +181,7 @@ Typographical glossary
- 
-    Character
-       A character is a Platonic ideal reified into at least one
--      :term:`glyph`. For example the letter "s" is a character
-+      :term:`glyph <Glyph>`. For example the letter "s" is a character
-       which is reified into several different glyphs: "S", "s", "*s*", long-s, etc.
-       Note that these glyphs can look fairly different from each other, however
-       although the glyph for an integral sign might be the same as the long-s
-@@ -232,7 +232,7 @@ Typographical glossary
- 
-    Descent
-       In traditional typography the descent of a font was the distance from the
--      bottom of a block of type to the :term:`baseline`.
-+      bottom of a block of type to the :term:`baseline <Baseline>`.
- 
-       Its precise meaning in modern typography seems to vary with different
-       definers.
-@@ -248,7 +248,7 @@ Typographical glossary
-       :ref:`anchored marks <anchorcontrol.DeviceTable>`.
- 
-    Didot point
--      The European :term:`point`. 62 :sup:`2`/:small:`3` points per
-+      The European :term:`point <Point>`. 62 :sup:`2`/:small:`3` points per
-       23.566mm ( 2.66pt/mm or 67.55pt/inch ). There is also a "metric" didiot
-       point: .4mm.
- 
-@@ -275,7 +275,7 @@ Typographical glossary
- 
-    Encoding
-       An encoding is a mapping from a set of bytes onto a
--      :term:`character set`. It is what determines which
-+      :term:`character set <Character set>`. It is what determines which
-       byte sequence represents which character. The words "encoding" and "character
-       set" are often used synonymously. The specification for ASCII specifies both
-       a character set and an encoding. But CJK character sets often have multiple
-@@ -293,7 +293,7 @@ Typographical glossary
-       two sounds associated with it, but it does, see also
-       :term:`Thorn`)
- 
--   Even-Odd Fill rule
-+   Even-Odd Fill Rule
-       To determine if a pixel should be
-       :ref:`filled using this rule <editexample2.even-odd-non-zero>`, draw a line from the
-       pixel to infinity (in any direction) then count the number of times contours
-@@ -332,7 +332,7 @@ Typographical glossary
-    Font
-       A collection of :term:`glyphs <Glyph>`, generally with at least one
-       glyph associated with each character in the font's
--      :term:`character set`, often with an encoding.
-+      :term:`character set <Character set>`, often with an encoding.
- 
-       A font contains much of the information needed to turn a sequence of bytes
-       into a set of pictures representing the characters specified by those bytes.
-@@ -342,8 +342,8 @@ Typographical glossary
-       different font for each point-size.
- 
-    Font Family, or just Family
--      A collection of related :term:`font`\ s. Often including plain,
--      italic and bold :term:`style`\ s.
-+      A collection of related :term:`font <Font>`\ s. Often including plain,
-+      italic and bold :term:`style <Style>`\ s.
- 
-    FontForge
-       This.
-@@ -356,7 +356,7 @@ Typographical glossary
-    Fractur
-       The old black letter writing style used in Germany up until world war II.
- 
--      See also :term:`gothic`.
-+      See also :term:`Gothic`.
- 
-    Fuþark
-    Futhark
-@@ -430,7 +430,7 @@ Typographical glossary
-       China.
- 
-    Hangul
--      The Korean :term:`syllabary`. The only syllabary (that
-+      The Korean :term:`Syllabary`. The only syllabary (that
-       I'm aware of anway) based on an alphabet -- the letters of the alphabet never
-       appear alone, but only as groups of two or three making up a syllable.
- 
-@@ -439,11 +439,11 @@ Typographical glossary
- 
-    Hints
-       These are described in detail in :ref:`the main manual <overview.Hints>`.
--      They help the rasterizer to draw a :term:`glyph` well at
-+      They help the rasterizer to draw a :term:`glyph <Glyph>` well at
-       small pointsizes.
- 
-    Hint Masks
--      At any given point on a contour :term:`hints` may not
-+      At any given point on a contour :term:`hints <Hints>` may not
-       :term:`conflict <Conflicting hints>`. However different points in a
-       glyph may need conflicting hints. So every now and then a contour will change
-       which hints are active. Each list of active hints is called a hint mask.
-@@ -457,7 +457,7 @@ Typographical glossary
-       Generally used to mean Han (Chinese) characters.
- 
-    Italic
--      A slanted :term:`style` of a font, generally used for
-+      A slanted :term:`style <Style>` of a font, generally used for
-       emphasis.
- 
-       Italic differs from :term:`Oblique` in that the
-@@ -498,7 +498,7 @@ Typographical glossary
-       to it.
- 
-    Kern pair
--      A pair of glyphs for which :term:`kerning` information has
-+      A pair of glyphs for which :term:`kerning <Kerning>` information has
-       been specified.
- 
-    Kerning by classes
-@@ -541,9 +541,9 @@ Typographical glossary
- 
-    Manyogana
-       An early Japanese script, ancestral to both
--      :term:`hiragana` and :term:`katakana`.
-+      :term:`Hiragana` and :term:`Katakana`.
-       `Manyogana <http://en.wikipedia.org/wiki/Manyogana>`__ used
--      :term:`kanji` for their phontic sounds, and over the years
-+      :term:`Kanji` for their phontic sounds, and over the years
-       these kanji were simplified into hiragana and katahana.
- 
-    Metal Type
-@@ -622,7 +622,7 @@ Typographical glossary
-       :doc:`here for the tables used by FontForge </techref/TrueOpenTables>`.
- 
-    Oblique
--      A slanted :term:`style` of a font, generally used for
-+      A slanted :term:`style <Style>` of a font, generally used for
-       emphasis.
- 
-       Oblique differs from :term:`Italic` in that the
-@@ -695,7 +695,7 @@ Typographical glossary
-       `See Caslon's type specimen sheet on Wikipedia. <http://en.wikipedia.org/wiki/Alphabet>`__
- 
-    Pica point
--      The Anglo-American :term:`point`. With 72.27 points per inch
-+      The Anglo-American :term:`point <Point>`. With 72.27 points per inch
-       ( 2.85pt /mm ).
- 
-    Point
-@@ -708,7 +708,7 @@ Typographical glossary
-       points per inch, 2.86pt/mm).
- 
-       The didiot and pica points were so arranged that text at a given point-size
--      would have approximately the same :term:`cap-height` in
-+      would have approximately the same :term:`cap-height <Cap-height>` in
-       both systems, the didot point would have extra white-space above the capitals
-       to contain the accents present in most non-English Latin based scripts.
- 
-@@ -757,7 +757,7 @@ Typographical glossary
-         again only allows a 1 byte encoding, but the OpenType wrapper extends this to
-         provide more complex encoding types.
-       * Type 3 -- This format allows full postscript within the font, but it means
--        that no :term:`hints` are allowed, so these fonts will not
-+        that no :term:`hints <Hints>` are allowed, so these fonts will not
-         look as nice at small point-sizes. Also most (screen) rasterizers are
-         incapable of dealing with them. A type 3 font is limited to a one byte
-         encoding (ie. only 256 glyphs may be encoded).
-@@ -922,13 +922,13 @@ Typographical glossary
-    Style
-       There are various conventional variants of a font. In probably any writing
-       system the thickness of the stems of the glyphs may be varied, this is called
--      the :term:`weight` of a font. Common weights are normal and
-+      the :term:`weight <Weight>` of a font. Common weights are normal and
-       bold.
- 
--      In :term:`LGC` alphabets an :term:`italic` (or
--      :term:`oblique`) style has arisen and is used for emphasis.
-+      In :term:`LGC` alphabets an :term:`italic <Italic>` (or
-+      :term:`oblique <Oblique>`) style has arisen and is used for emphasis.
- 
--      Fonts are often compressed into a :term:`condensed`
-+      Fonts are often compressed into a :term:`condensed <Condensed>`
-       style, or expanded out into an :term:`extended style <Extended>`.
- 
-       Various other styles are in occasional use: underline, overstrike, outline,
-@@ -945,7 +945,7 @@ Typographical glossary
-       tend to be bigger than alphabets (Japanese KataKana requires about 60
-       different characters, while the Korean Hangul requires tens of thousands).
- 
--      See Also: :term:`abjad`, :term:`abugida`, :term:`alphabet` and the relevant
-+      See Also: :term:`Abjad`, :term:`Abugida`, :term:`Alphabet` and the relevant
-       `Wikipedia article <http://en.wikipedia.org/wiki/S%20yllabary>`__.
- 
-    TeX
-@@ -1061,7 +1061,7 @@ Typographical glossary
- 
-    Width
-       This is a slightly ambiguous term and is sometimes used to mean the
--      :term:`advance width` (the distance from the start of
-+      :term:`advance width <Advance Width>` (the distance from the start of
-       this glyph to the start of the next glyph), and sometimes used to mean the
-       distance from the left side bearing to the right side bearing.
diff --git a/fix-return-statement.patch b/fix-return-statement.patch
index 5044bb1..ac7f9f2 100644
--- a/fix-return-statement.patch
+++ b/fix-return-statement.patch
@@ -1,27 +1,7 @@
-Index: fontforge-20200314/gdraw/ggdkdraw.c
+Index: fontforge-20201107/fontforgeexe/cvimportdlg.c
 ===================================================================
---- fontforge-20200314.orig/gdraw/ggdkdraw.c
-+++ fontforge-20200314/gdraw/ggdkdraw.c
-@@ -2333,6 +2333,7 @@ static void GGDKDrawSyncThread(GDisplay
- static GWindow GGDKDrawPrinterStartJob(GDisplay *UNUSED(gdisp), void *UNUSED(user_data), GPrinterAttrs *UNUSED(attrs)) {
-     Log(LOGERR, " ");
-     assert(false);
-+    return (GWindow)0L;
- }
- 
- static void GGDKDrawPrinterNextPage(GWindow UNUSED(w)) {
-@@ -2343,6 +2344,7 @@ static void GGDKDrawPrinterNextPage(GWin
- static int GGDKDrawPrinterEndJob(GWindow UNUSED(w), int UNUSED(cancel)) {
-     Log(LOGERR, " ");
-     assert(false);
-+    return 0;
- }
- 
- 
-Index: fontforge-20200314/fontforgeexe/cvimportdlg.c
-===================================================================
---- fontforge-20200314.orig/fontforgeexe/cvimportdlg.c
-+++ fontforge-20200314/fontforgeexe/cvimportdlg.c
+--- fontforge-20201107.orig/fontforgeexe/cvimportdlg.c
++++ fontforge-20201107/fontforgeexe/cvimportdlg.c
 @@ -710,6 +710,7 @@ static int GFD_Options(GGadget *g, GEven
  	_ImportParamsDlg(ImportParamsState());
  	d->opts_shown = true;
diff --git a/fontforge-20200314-repacked.tar.xz b/fontforge-20200314-repacked.tar.xz
deleted file mode 100644
index 5160ccb..0000000
--- a/fontforge-20200314-repacked.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af7e09052d5a5f6b20b69d868b574637ee6cd72ab560429e29437392abe71810
-size 28239648
diff --git a/fontforge.changes b/fontforge.changes
index bde1145..bb8e3c5 100644
--- a/fontforge.changes
+++ b/fontforge.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Feb 20 10:46:42 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 20201107:
+  * This release falls on the 20th anniversary of the first release of
+    FontForge back in 2000. It brings a wide range of minor tweaks and bug
+    fixes for the user interface and file format handlers and a special splash
+    screen to commemorate the big day
+- fix-glossary.patch, support-sphinx3.patch: drop (upstream)
+- remove get-source.sh: the binaries that needed to be repackaged
+  are no longer in the upstream release tarball
+- fix-return-statement.patch: refresh against new release
+
 -------------------------------------------------------------------
 Mon Jun 29 11:27:50 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/fontforge.spec b/fontforge.spec
index ea42109..b876752 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fontforge
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,24 +17,17 @@
 
 
 Name:           fontforge
-Version:        20200314
+Version:        20201107
 Release:        0
 Summary:        A Font Editor
 License:        GPL-3.0-or-later
-URL:            http://fontforge.org/
-#       Source: https://github.com/fontforge/fontforge/archive/%%{version}.tar.gz
-#           see bug 926061, fontforge-*-repacked.tar.xz does not contain fontforge-*/win/gold/libX11-*.noarch.rpm
-Source0:        fontforge-%{version}-repacked.tar.xz
-Source1:        get-source.sh
-# workardound for bug 930076, imho upstream should fix this
+URL:            https://fontforge.org/
+Source0:        https://github.com/fontforge/fontforge/archive/%{version}.tar.gz
+# workaround for bug 930076, imho upstream should fix this
 # https://github.com/fontforge/fontforge/issues/2270
 Patch0:         fontforge-version.patch
 Patch1:         fix-return-statement.patch
 Patch2:         fix-sphinx-doc.patch
-# gh#fontforge/fontforge#4269
-Patch3:         support-sphinx3.patch
-# taken from gh#fontforge/fontforge#4284
-Patch4:         fix-glossary.patch
 Patch5:         add-bitmap-transform-support.patch
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
@@ -107,8 +100,6 @@ to develop applications that use FontForge libraries.
 %if %{?suse_version} < 1550
 %patch2 -p1
 %endif
-%patch3 -p1
-%patch4 -p1
 %patch5 -p1
 
 %build
diff --git a/get-source.sh b/get-source.sh
deleted file mode 100644
index 3010a04..0000000
--- a/get-source.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-#
-# repack source -- delete libX11-*.noarch.rpm from there; see bug #926061
-#
-
-VERSION=$1
-
-if [ -z $VERSION ]; then
-  echo "usage: $0 date_version"
-  echo "example: $0 20150330"
-  exit 1
-fi
-
-wget "https://github.com/fontforge/fontforge/archive/$VERSION.tar.gz"
-tar xf $VERSION.tar.gz
-pushd fontforge-$VERSION
-# do not depend on git
-git clone https://github.com/troydhanson/uthash
-git clone --depth 1 https://github.com/coreutils/gnulib.git gnulib
-# remove not shippable files (bug 926061)
-# rm win/gold/libX11-*.noarch.rpm
-popd
-tar cJf fontforge-$VERSION-repacked.tar.xz fontforge-$VERSION
-rm -rf fontforge-$VERSION
-rm $VERSION.tar.gz
-
diff --git a/support-sphinx3.patch b/support-sphinx3.patch
deleted file mode 100644
index 9ea81ab..0000000
--- a/support-sphinx3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 36b52b9902a9e3858ef34ec006b6ad5da6374de1 Mon Sep 17 00:00:00 2001
-From: Jeremy Tan <jtanx@outlook.com>
-Date: Mon, 6 Apr 2020 20:57:14 +1000
-Subject: [PATCH] sphinx: make changes to support Sphinx 3
-
----
- doc/sphinx/scripting/python/fontforge.rst | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/doc/sphinx/scripting/python/fontforge.rst b/doc/sphinx/scripting/python/fontforge.rst
-index b97332229c..f726b1ed4f 100644
---- a/doc/sphinx/scripting/python/fontforge.rst
-+++ b/doc/sphinx/scripting/python/fontforge.rst
-@@ -1365,6 +1365,7 @@ Layers may be compared to see if their contours are similar.
-             layer.stroke("calligraphic", width, height, angle[, FLAGS])
-             layer.stroke("polygon", contour[, FLAGS])
-    (Legacy interface)
-+   :noindex:
- 
- .. method:: layer.stroke("circular", width  [, CAP, JOIN, ANGLE, KEYWORD])
-             layer.stroke("elliptical", width, minor_width  [, ANGLE, CAP, JOIN, KEYWORD])
-@@ -2458,6 +2459,7 @@ must be created through the font.
-             glyph.stroke("calligraphic", width, height, angle[, FLAGS])
-             glyph.stroke("polygon", contour[, FLAGS])
-    (Legacy interface)
-+   :noindex:
- 
- .. method:: glyph.stroke("circular", width[, CAP, JOIN, ANGLE, KEYWORD])
-             glyph.stroke("elliptical", width, minor_width[, ANGLE, CAP, JOIN, KEYWORD])
-@@ -4786,21 +4788,6 @@ See the :class:`selection` type for how to alter the selection.
-    Extrema should be marked by on-curve points. If a curve in any selected
-    glyph lacks a point at a significant extremum this command will add one.
- 
--.. method:: font.addSmallCaps()
--
--   For all selected upper or lower case letters in the latin, greek and
--   cyrillic scripts this will try to create a small caps version of that glyph
--   in a new glyph slot.
--
--   So if you select "A" (or "a") then a glyph "a.sc" will be created (if "a.sc"
--   already exists, it will be reused, and its current contents cleared).
--
--   The contents of "a.sc" will be based on the upper case variant of this glyph
--   (and that variant must be present for the command to work). FontForge will
--   also create two lookups (unless appropriate ones already exist) one, bound
--   to the feature 'c2sc' will map upper case letters to small caps, the other,
--   bound to feature 'smcp' will map lower case letters to small caps.
--
- .. method:: font.autoHint()
- 
-    Generates PostScript hints for all selected glyphs.
-@@ -4993,6 +4980,7 @@ See the :class:`selection` type for how to alter the selection.
-             font.stroke("calligraphic", width, height, angle[, FLAGS])
-             font.stroke("polygon", contour[, FLAGS])
-    (Legacy interface)
-+   :noindex:
- 
- .. method:: font.stroke("circular", width[, CAP, JOIN, ANGLE, KEYWORD])
-             font.stroke("elliptical", width, minor_width[, ANGLE, CAP, JOIN, KEYWORD])