diff --git a/Makefile b/Makefile
index 61f6c1461..2fa7b3eae 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ endif
 	touch $@
 
 bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/vendor.ok .build/artifacts-ui.ok
-	go-bindata-assetfs -o bindata_assetfs.go -nometadata ui/build/...
+	go-bindata-assetfs -o bindata_assetfs.go -nometadata ui/build/... ui/src/...
 
 $(NAME): .build/deps-build-go.ok .build/vendor.ok bindata_assetfs.go $(SOURCES)
 	go build -ldflags "-X main.version=$(VERSION)"
diff --git a/main.go b/main.go
index 8be9099a8..dfb2d7c4e 100644
--- a/main.go
+++ b/main.go
@@ -39,8 +39,8 @@ var (
 	// rather than do all the filtering every time
 	apiCache *cache.Cache
 
-	// used by static file view handlers
-	staticFileSystem = newBinaryFileSystem("ui/build")
+	staticBuildFileSystem = newBinaryFileSystem("ui/build")
+	staticSrcFileSystem   = newBinaryFileSystem("ui/src")
 )
 
 func getViewURL(sub string) string {
@@ -55,7 +55,13 @@ func getViewURL(sub string) string {
 
 func setupRouter(router *gin.Engine) {
 	router.Use(gzip.Gzip(gzip.DefaultCompression))
-	router.Use(static.Serve(getViewURL("/"), staticFileSystem))
+	router.Use(static.Serve(getViewURL("/"), staticBuildFileSystem))
+	// next 2 lines are to allow service raw sources so sentry can fetch source maps
+	router.Use(static.Serve(getViewURL("/static/js/"), staticSrcFileSystem))
+	// FIXME
+	// compressed sources are under /static/js/main.js and reference ../static/js/main.js
+	// so we end up with /static/static/js
+	router.Use(static.Serve(getViewURL("/static/static/js/"), staticSrcFileSystem))
 	router.Use(cors.New(cors.Config{
 		AllowAllOrigins:  true,
 		AllowCredentials: true,