diff --git a/cmd/ofagent/main.go b/cmd/ofagent/main.go
index 987a8e6..d32fecc 100644
--- a/cmd/ofagent/main.go
+++ b/cmd/ofagent/main.go
@@ -104,6 +104,9 @@
 
 	log.SetAllLogLevel(logLevel)
 
+	// depending on the build tags start the profiler
+	realMain()
+
 	defer func() {
 		err := log.CleanUp()
 		if err != nil {
diff --git a/cmd/ofagent/profile.go b/cmd/ofagent/profile.go
new file mode 100644
index 0000000..6ac7528
--- /dev/null
+++ b/cmd/ofagent/profile.go
@@ -0,0 +1,31 @@
+// +build profile
+
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+	"net/http"
+	_ "net/http/pprof"
+)
+
+func realMain() {
+	go func() {
+		logger.Fatal(http.ListenAndServe("0.0.0.0:6060", nil))
+	}()
+
+}
\ No newline at end of file
diff --git a/cmd/ofagent/release.go b/cmd/ofagent/release.go
new file mode 100644
index 0000000..67f8187
--- /dev/null
+++ b/cmd/ofagent/release.go
@@ -0,0 +1,23 @@
+// +build !profile
+
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+func realMain() {
+	logger.Infoln("NOT PROFILING")
+}