diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d3fceb..64278bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,19 @@ build:
   stage: build
   before_script:
     - apt update && apt install -y make wget git emacs sudo
-    - git clone -b fpkg-v2 https://gitlab.com/FG42/FG42 ~/.fg42/ && cd ~/.fg42/ && make install
+    - git clone -b fpkg-v2 https://gitlab.com/FG42/FG42 ~/.fg42/ && cd ~/.fg42/ && make install && cd
   script:
     - fg42 -nw --script build.el
+
+build-package:
+  extends: build
+  script:
+    - fg42 -nw --script build.el
+    - tar zcf fg42.$CI_COMMIT_TAG.tar.gz ~/.fg42/
+  artifacts:
+    when: on_success
+    paths:
+    - ~/fg42.$CI_COMMIT_TAG.tar.gz
+  only:
+    - tags
+    - master
diff --git a/build.el b/build.el
index b005646..8eb8c20 100644
--- a/build.el
+++ b/build.el
@@ -1,3 +1,26 @@
+;;; build --- build script for FG42
+;;
+;; Copyright (C) 2010-2020  Sameer Rahmani <lxsameer@gnu.org>
+;;
+;; Author: Sameer Rahmani <lxsameer@gnu.org>
+;; Keywords: lisp fg42 IDE package manager
+;; Version: 1.0.0
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
+;;; Commentary:
+;;; Code:
 (add-to-list 'load-path (concat (getenv "HOME") ".fg42/lib"))
 
 (defvar bootstrap-version nil
@@ -19,3 +42,6 @@
       (load bootstrap-file nil 'nomessage))))
 
 (fpkg-initialize)
+
+(provide 'build)
+;;; build.el ends here
diff --git a/lib/fpkg.el b/lib/fpkg.el
index ea1cfb6..866e1d6 100644
--- a/lib/fpkg.el
+++ b/lib/fpkg.el
@@ -1,6 +1,6 @@
 ;;; fpkg --- a simple package manager for FG42                     -*- lexical-binding: t; -*-
 ;;
-;; Copyright (C) 2010-2012  Sameer Rahmani <lxsameer@gnu.org>
+;; Copyright (C) 2010-2020  Sameer Rahmani <lxsameer@gnu.org>
 ;;
 ;; Author: Sameer Rahmani <lxsameer@gnu.org>
 ;; Keywords: lisp fg42 IDE package manager