diff --git a/Makefile b/Makefile
index 4da4c551c8..b6f4b23a31 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,20 @@
 UNAME = $(shell uname)
+FILES=qml *.png
 
 # Default is building
 all:
-	go install
+	cp *.go $(GOPATH)/src/github.com/ethereum/go-ethereum
+	cp -r ui $(GOPATH)/src/github.com/ethereum/go-ethereum
+	go install github.com/ethereum/go-ethereum
 
 install:
 # Linux build
 ifeq ($(UNAME),Linux)
-	mkdir /usr/local/ethereal
-	files=(wallet.qml net.png network.png new.png tx.png)
-	for file in "${files[@]}"; do
-		cp $file /usr/share/ethereal
+	mkdir /usr/share/ethereal
+	for file in $(FILES); do \
+		cp -r $$file /usr/share/ethereal; \
 	done
-	cp $GOPATH/bin/go-ethereum /usr/local/bin/ethereal
+	cp $(GOPATH)/bin/go-ethereum /usr/local/bin/ethereal
 endif
 # OS X build
 ifeq ($(UNAME),Darwin)
diff --git a/configure b/configure
new file mode 100755
index 0000000000..2e3abda70e
--- /dev/null
+++ b/configure
@@ -0,0 +1,2 @@
+#!/bin/bash
+sed -i '1i\GOPATH='$GOPATH Makefile