diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..a5f1729e
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,46 @@
+---
+name: CI
+
+on:
+ push:
+ branches: ["master"]
+ pull_request:
+ branches: ["master"]
+ workflow_dispatch:
+
+jobs:
+ tests:
+ name: "Python ${{ matrix.python-version }} ${{ matrix.tox-test }}"
+ runs-on: "ubuntu-latest"
+
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+ tox-test: ["default"]
+
+ steps:
+ - uses: "actions/checkout@v2"
+ - uses: "actions/setup-python@v2"
+ with:
+ python-version: "${{ matrix.python-version }}"
+ - name: "Install test locales"
+ run: |
+ echo "de_DE.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
+ echo "cs_CZ.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
+ echo "el_GR.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
+ echo "fr_FR.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen
+ sudo locale-gen
+ - name: "Install dependencies"
+ run: |
+ set -xe
+ python -VV
+ python -m site
+ python -m pip install --upgrade pip setuptools wheel
+ python -m pip install --upgrade coverage[toml] virtualenv tox tox-gh-actions
+
+ - name: "Run tox targets for ${{ matrix.python-version }}"
+ if: ${{ matrix.tox-test == 'default' }}
+ # Fake a TTY
+ shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
+ run: "python -m tox"
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..cc2c4d9a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+*.pyc
+*.swp
+khal/version.py
+khal.egg-info/
+build/
+dist/
+.eggs/*
+*.egg
+*.db
+.tox
+.coverage
+.cache
+htmlcov
+doc/source/configspec.rst
+.mypy_cache/
+.env
+.venv
+env/
+venv/
diff --git a/debian/changelog b/debian/changelog
index 02b47f44..d0b56df0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+khal (1:0.10.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport fix from upstream merge request for FTBFS with
+ tzdata 2022g. (Closes: #1028833)
+
+ -- Adrian Bunk <bunk@debian.org> Sun, 12 Feb 2023 13:41:00 +0200
+
khal (1:0.10.5-1) unstable; urgency=medium
[ upstream ]
diff --git a/debian/patches/0001-Update-Colombia-s-1993-fallback.patch b/debian/patches/0001-Update-Colombia-s-1993-fallback.patch
new file mode 100644
index 00000000..3746709e
--- /dev/null
+++ b/debian/patches/0001-Update-Colombia-s-1993-fallback.patch
@@ -0,0 +1,45 @@
+From f93bcf1641c2c5381de93c91437ad5c903997f3a Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol@mornie.org>
+Date: Mon, 19 Dec 2022 14:12:20 +0100
+Subject: Update Colombia's 1993 fallback
+
+In 2022g release of tz code we have:
+
+ Colombia's 1993 fallback was 02-06 24:00, not 04-04 00:00.
+
+See https://mm.icann.org/pipermail/tz-announce/2022-November/000076.html
+for details.
+---
+ tests/ics/cal_no_dst.ics | 2 +-
+ tests/vtimezone_test.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/ics/cal_no_dst.ics b/tests/ics/cal_no_dst.ics
+index d22ada6..73c39b7 100644
+--- a/tests/ics/cal_no_dst.ics
++++ b/tests/ics/cal_no_dst.ics
+@@ -4,7 +4,7 @@ PRODID:-//PIMUTILS.ORG//NONSGML khal / icalendar //EN
+ BEGIN:VTIMEZONE
+ TZID:America/Bogota
+ BEGIN:STANDARD
+-DTSTART;VALUE=DATE-TIME:19930403T230000
++DTSTART;VALUE=DATE-TIME:19930206T230000
+ TZNAME:COT
+ TZOFFSETFROM:-0400
+ TZOFFSETTO:-0500
+diff --git a/tests/vtimezone_test.py b/tests/vtimezone_test.py
+index d19936c..4c19b78 100644
+--- a/tests/vtimezone_test.py
++++ b/tests/vtimezone_test.py
+@@ -67,7 +67,7 @@ def test_bogota(pytz_version):
+ vbogota = [b'BEGIN:VTIMEZONE',
+ b'TZID:America/Bogota',
+ b'BEGIN:STANDARD',
+- b'DTSTART;VALUE=DATE-TIME:19930403T230000',
++ b'DTSTART;VALUE=DATE-TIME:19930206T230000',
+ b'TZNAME:COT',
+ b'TZOFFSETFROM:-0400',
+ b'TZOFFSETTO:-0500',
+--
+2.30.2
+
diff --git a/debian/patches/series b/debian/patches/series
index f797758e..c086170b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
2002_Fix_intersphinx_mapping.patch
2003_Avoid_privacy_breach_in_sphinx_doc.patch
2004_version.patch
+0001-Update-Colombia-s-1993-fallback.patch
diff --git a/doc/source/ystatic/.gitignore b/doc/source/ystatic/.gitignore
new file mode 100644
index 00000000..e69de29b
