diff --git a/.travis.yml b/.travis.yml
index dd18894ce..5128775df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,12 +45,34 @@ jobs:
       name: "Windows"
       services:
         - docker
-      before_install:
-        - docker pull cdrx/pyinstaller-windows:python3-32bit
       install:
-        - docker run -v "$(pwd):/src/lbry" cdrx/pyinstaller-windows:python3-32bit lbry/scripts/wine_build.sh
+        - docker pull cdrx/pyinstaller-windows:python3-32bit
       script:
-        - find dist/
+        - docker run -v "$(pwd):/src/lbry" cdrx/pyinstaller-windows:python3-32bit lbry/scripts/wine_build.sh
+      addons:
+        artifacts:
+          working_dir: dist
+          paths:
+            - lbry.exe
+          target_paths:
+            - /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/win
+
+    - name: "Linux"
+      install:
+        - pip install pyinstaller
+        - pip install git+https://github.com/lbryio/torba.git
+        - pip install git+https://github.com/lbryio/lbryschema.git
+        - pip install -e .
+      script:
+        - pyinstaller -F -n lbry lbrynet/cli.py
+        - ./dist/lbry --version
+      addons:
+        artifacts:
+          working_dir: dist
+          paths:
+            - lbry
+          target_paths:
+            - /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/linux
 
 cache:
   directories:
diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py
index 027498237..b55f2c5cb 100644
--- a/lbrynet/__init__.py
+++ b/lbrynet/__init__.py
@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "0.21.2"
+__version__ = "0.30.0a"
 version = tuple(__version__.split('.'))
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/lbrynet/cli.py b/lbrynet/cli.py
index 33e3f6d7d..487c7ae87 100644
--- a/lbrynet/cli.py
+++ b/lbrynet/cli.py
@@ -89,7 +89,6 @@ def main(argv):
             print_help_for_command(args[0])
         else:
             print_help()
-        return 0
 
     elif method in ['version', '--version', '-v']:
         print("@hackrush didn't implement this yet :-p")
diff --git a/scripts/wine_build.sh b/scripts/wine_build.sh
index cf26b8bbe..9e8e4c12a 100755
--- a/scripts/wine_build.sh
+++ b/scripts/wine_build.sh
@@ -17,5 +17,5 @@ cd torba && pip install -e . && cd ..
 
 cd lbry
 pip install -e .
-pyinstaller lbrynet/daemon/DaemonControl.py
-wine dist/DaemonControl/DaemonControl.exe --version
+pyinstaller -F -n lbry lbrynet/cli.py
+wine dist/lbry.exe --version