diff --git a/README.md b/README.md
index f9b69b00c..306c93ee9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # Olive Video Editor
 
-Olive is a non-linear video editor for Windows, macOS, and Linux.
+Olive is a free non-linear video editor for Windows, macOS, and Linux.
 
-Discover more and download binaries at: https://www.olivevideoeditor.org/
\ No newline at end of file
+Discover more and download binaries at: https://www.olivevideoeditor.org/
+
+For compilation information, check the [wiki](https://github.com/olive-editor/olive/wiki). Currently the `master` branch serves more or less as the stable branch and the majority of development happens in the `alpha` branch. Before filing a feature request or bug report, please try the `alpha` branch first to ensure it hasn't already been addressed.
+
+If you like Olive, please consider helping keep it alive by supporting it on [Patreon](https://www.patreon.com/olivevideoeditor).
diff --git a/olive.pro b/olive.pro
index 000bc854d..78bd16870 100644
--- a/olive.pro
+++ b/olive.pro
@@ -197,7 +197,8 @@ mac {
 }
 
 linux {
-    LIBS += -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libavutil libavformat libavcodec libavfilter libswscale libswresample
 }
 
 RESOURCES += \
diff --git a/snap/gui/olive-editor.desktop b/snap/gui/olive-editor.desktop
new file mode 100644
index 000000000..5734c00af
--- /dev/null
+++ b/snap/gui/olive-editor.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Olive
+Comment=Professional open-source NLE video editor
+Exec=olive-editor
+Icon=${SNAP}/meta/gui/olive-editor.png
+Terminal=false
+Type=Application
+Categories=AudioVideo;Recorder;
+StartupNotify=true
\ No newline at end of file
diff --git a/snap/gui/olive-editor.png b/snap/gui/olive-editor.png
new file mode 100644
index 000000000..477abe40b
Binary files /dev/null and b/snap/gui/olive-editor.png differ
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 000000000..ba04fe708
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,74 @@
+name: olive-editor
+base: core18 # the base snap is the execution environment for this snap
+adopt-info: olive
+summary: Professional open-source NLE video editor
+description: |
+  Olive is a non-linear video editor for Windows, macOS, and Linux.
+
+grade: stable
+confinement: strict
+
+apps:
+  olive-editor:
+    environment:
+      "LD_LIBRARY_PATH": "$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio"
+    command: desktop-launch $SNAP/bin/Olive
+    plugs:
+      - opengl
+      - desktop
+      - desktop-legacy
+      - x11
+      - network
+      - pulseaudio
+      - home
+      - removable-media
+
+parts:
+  olive:
+    plugin: qmake
+    source: .
+    build-packages:
+      - qt5-default
+      - qtmultimedia5-dev 
+      - libavformat-dev
+      - libavfilter-dev
+    stage-packages:
+      - ffmpeg
+      - libqt5multimedia5
+      - libqt5multimedia5-plugins
+      - libpulse0
+      - libslang2
+      - libglu1-mesa
+    override-build: |
+      qmake olive.pro
+      make
+      mkdir -p $SNAPCRAFT_PART_INSTALL/bin
+      cp Olive $SNAPCRAFT_PART_INSTALL/bin
+      snapcraftctl set-version $(git rev-parse --short HEAD)
+  desktop-qt5:
+    build-packages:
+    - build-essential
+    - qtbase5-dev
+    - dpkg-dev
+    make-parameters:
+    - FLAVOR=qt5
+    plugin: make
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: qt
+    stage-packages:
+    - libxkbcommon0
+    - ttf-ubuntu-font-family
+    - dmz-cursor-theme
+    - light-themes
+    - adwaita-icon-theme
+    - gnome-themes-standard
+    - shared-mime-info
+    - libqt5gui5
+    - libgdk-pixbuf2.0-0
+    - libqt5svg5
+    - try:
+      - appmenu-qt5
+    - locales-all
+    - xdg-user-dirs
+    - fcitx-frontend-qt5
+