diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..d39c21b4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,92 @@
+PKG := github.com/lightningnetwork/lnd
+HAVE_DEP := $(shell command -v dep 2> /dev/null)
+COMMIT := $(shell git rev-parse HEAD)
+LDFLAGS := -ldflags "-X main.Commit=$(COMMIT)"
+RM := rm
+
+all: scratch
+
+
+# ==============================================================================
+# INSTALLATION
+# ==============================================================================
+
+deps:
+ifndef HAVE_DEP
+	@echo "Fetching dep."
+	go get -u github.com/golang/dep/cmd/dep
+endif
+	@echo "Building dependencies."
+	dep ensure -v
+
+build: 
+	@echo "Building lnd and lncli."
+	go build -v -o lnd $(LDFLAGS) $(PKG)
+	go build -v -o lncli $(LDFLAGS) $(PKG)/cmd/lncli
+
+install:
+	@echo "Installing lnd and lncli."
+	go install -v $(LDFLAGS) $(PKG)
+	go install -v $(LDFLAGS) $(PKG)/cmd/lncli
+
+scratch: deps build
+
+
+# ==============================================================================
+# TESTING
+# ==============================================================================
+
+# Define the integration test.run filter if the icase argument was provided.
+ifneq ($(icase),)
+	ITESTCASE := -test.run=TestLightningNetworkDaemon/$(icase)
+endif
+
+# UNIT_TARGTED is defined iff a specific package and/or unit test case is being
+# targeted.
+UNIT_TARGETED = 
+
+# If specific package is being unit tested, construct the full name of the
+# subpackage.
+ifneq ($(pkg),)
+	UNITPKG := $(PKG)/$(pkg)
+	UNIT_TARGETED = yes
+endif
+
+# If a specific unit test case is being target, construct test.run filter.
+ifneq ($(case),)
+	UNITCASE := -test.run=$(case)
+	UNIT_TARGETED = yes
+endif
+
+# If no unit targeting was input, default to running all tests. Otherwise,
+# construct the command to run the specific package/test case.
+ifndef UNIT_TARGETED
+	UNIT := go list $(PKG)/... | grep -v '/vendor/' | xargs go test
+else
+	UNIT := go test -test.v $(UNITPKG) $(UNITCASE)
+endif
+
+check: unit itest
+
+itest: install
+	@echo "Running integration tests."
+	go test -v -tags rpctest -logoutput $(ITESTCASE)
+
+unit:
+	@echo "Running unit tests."
+	$(UNIT)
+
+
+# ==============================================================================
+# UTILITIES
+# ==============================================================================
+
+fmt:
+	go list $(PKG)/... | grep -v '/vendor/' | xargs go fmt -x
+
+clean:
+	$(RM) ./lnd ./lncli
+	$(RM) -rf vendor
+
+
+.PHONY: all deps build install scratch check itest unit fmt clean
diff --git a/cmd/lncli/main.go b/cmd/lncli/main.go
index 142ca5ae..d6bb7cc4 100644
--- a/cmd/lncli/main.go
+++ b/cmd/lncli/main.go
@@ -29,6 +29,10 @@ const (
 )
 
 var (
+	//Commit stores the current commit hash of this build. This should be
+	//set using -ldflags during compilation.
+	Commit string
+
 	defaultLndDir       = btcutil.AppDataDir("lnd", false)
 	defaultTLSCertPath  = filepath.Join(defaultLndDir, defaultTLSCertFilename)
 	defaultMacaroonPath = filepath.Join(defaultLndDir, defaultMacaroonFilename)
@@ -150,7 +154,7 @@ func getClientConn(ctx *cli.Context, skipMacaroons bool) *grpc.ClientConn {
 func main() {
 	app := cli.NewApp()
 	app.Name = "lncli"
-	app.Version = "0.4"
+	app.Version = fmt.Sprintf("%s commit=%s", "0.4", Commit)
 	app.Usage = "control plane for your Lightning Network Daemon (lnd)"
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
diff --git a/lnd.go b/lnd.go
index 9a0e1e71..11c77bdd 100644
--- a/lnd.go
+++ b/lnd.go
@@ -57,6 +57,10 @@ const (
 )
 
 var (
+	//Commit stores the current commit hash of this build. This should be
+	//set using -ldflags during compilation.
+	Commit string
+
 	cfg              *config
 	shutdownChannel  = make(chan struct{})
 	registeredChains = newChainRegistry()
diff --git a/version.go b/version.go
index 8e4ef787..77030ec6 100644
--- a/version.go
+++ b/version.go
@@ -55,6 +55,9 @@ func version() string {
 		version = fmt.Sprintf("%s+%s", version, build)
 	}
 
+	// Append commit hash of current build to version.
+	version = fmt.Sprintf("%s commit=%s", version, Commit)
+
 	return version
 }