diff --git a/makefiles/golang/beautify.mk b/makefiles/golang/beautify.mk
new file mode 100644
index 0000000..6c0d08d
--- /dev/null
+++ b/makefiles/golang/beautify.mk
@@ -0,0 +1,48 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# 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.
+# -----------------------------------------------------------------------
+# Intent: This makefile is used to apply standard formatting to golang src
+# -----------------------------------------------------------------------
+
+$(if $(DEBUG),$(warning ENTER))
+
+##-------------------##
+##---]  GLOBALS  [---##
+##-------------------##
+.PHONY: beautify-golang
+
+# beautify :: beautify-golang # default target (?)
+
+##-------------------##
+##---]  TARGETS  [---##
+##-------------------##
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+beautify-golang-args += -name '*.go'
+beautify-golang-args += -not -path '*/vendor/*'
+beautify-golang:
+	find . $(beautify-golang-args) -print0\
+	  | $(xargs-n1-clean) gofmt -e -s -w
+	$(HIDE)git status
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+help ::
+	@printf "  %-33.33s %s\n" 'beautify-golang' \
+	  'Autoformat golang source using gofmt -e -s w'
+
+# [EOF]
diff --git a/makefiles/golang/help.mk b/makefiles/golang/help.mk
new file mode 100644
index 0000000..3276f0f
--- /dev/null
+++ b/makefiles/golang/help.mk
@@ -0,0 +1,46 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# 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.
+# -----------------------------------------------------------------------
+
+$(if $(DEBUG),$(warning ENTER))
+
+## -----------------------------------------------------------------------
+## Intent: Display topic help
+## -----------------------------------------------------------------------
+help-summary ::
+	@printf '  %-30s %s\n' 'lint-shell'\
+	  'Run shellcheck on sources'
+	@printf '  %-30s %s\n' 'lint-shell-help'\
+	  'Show verbose target help'
+  ifdef VERBOSE
+	@$(MAKE) --no-print-directory lint-shell-help
+  endif
+
+## -----------------------------------------------------------------------
+## Intent: Display extended topic help
+## -----------------------------------------------------------------------
+.PHONY: lint-shell-help
+lint-shell-help ::
+	@printf '  %-30s %s\n' 'lint-shell-all'\
+	  'Shellcheck available sources'
+	@printf '  %-30s %s\n' 'lint-shell-mod'\
+	  'Shellcheck locally modified files (git status)'
+	@printf '  %-30s %s\n' 'lint-shell-src'\
+	  'Shellcheck files by path'
+
+$(if $(DEBUG),$(warning LEAVE))
+
+# [EOF]
diff --git a/makefiles/golang/include.mk b/makefiles/golang/include.mk
new file mode 100644
index 0000000..cd0ce7f
--- /dev/null
+++ b/makefiles/golang/include.mk
@@ -0,0 +1,27 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2023 Open Networking Foundation (ONF) and the ONF Contributors
+#
+# 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.
+# -----------------------------------------------------------------------
+
+$(if $(DEBUG),$(warning ENTER))
+
+##--------------------##
+##---]  INCLUDES  [---##
+##--------------------##
+include $(ONF_MAKEDIR)/golang/beautify.mk
+
+$(if $(DEBUG),$(warning LEAVE))
+
+# [EOF]