diff --git a/wm/Makefile b/wm/Makefile
index 124627107bc7..ec95d53b1dd4 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.147 2020/03/31 22:36:37 gutteridge Exp $
+# $NetBSD: Makefile,v 1.148 2020/04/12 17:34:18 pin Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -77,6 +77,7 @@ SUBDIR+=	sawfish
 SUBDIR+=	selectwm
 SUBDIR+=	skhd
 SUBDIR+=	skippy
+SUBDIR+=	sowm
 SUBDIR+=	spectrwm
 SUBDIR+=	swc
 SUBDIR+=	trayer
diff --git a/wm/sowm/DESCR b/wm/sowm/DESCR
new file mode 100644
index 000000000000..8be144f28534
--- /dev/null
+++ b/wm/sowm/DESCR
@@ -0,0 +1,10 @@
+sowm (Simple Opinionated Window Manager)
+An itsy bitsy floating window manager.
+
+- Floating only.
+- Fullscreen toggle.
+- Window centering.
+- Mix of mouse and keyboard workflow.
+- Focus with cursor.
+- Rounded corners (through patch(https://github.com/dylanaraps/sowm/pull/58))
+- Titlebars (through patch(https://github.com/dylanaraps/sowm/pull/57))
diff --git a/wm/sowm/Makefile b/wm/sowm/Makefile
new file mode 100644
index 000000000000..ccb5adaf1047
--- /dev/null
+++ b/wm/sowm/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1 2020/04/12 17:32:45 pin Exp $
+
+DISTNAME=	sowm-1.6
+CATEGORIES=	wm
+MASTER_SITES=	${MASTER_SITE_GITHUB:=dylanaraps/}
+
+MAINTAINER=	voidpin@protonmail.com
+HOMEPAGE=	https://github.com/dylanaraps/sowm/
+COMMENT=	Itsy bitsy floating window manager
+LICENSE=	mit
+
+USE_LANGUAGES=	c99
+
+INSTALLATION_DIRS+=	bin share/doc/sowm
+
+SUBST_CLASSES+=		optimize
+SUBST_STAGE.optimize=	pre-configure
+SUBST_SED.optimize+=	-e 's|-O3||g'
+SUBST_MESSAGE.optimize=	Do not force -O3 optimizations
+SUBST_FILES.optimize+=	Makefile
+
+DEPENDS+=	dmenu-[0-9]*:../../x11/dmenu
+DEPENDS+=	st-term-[0-9]*:../../x11/st-term
+DEPENDS+=	scrot-[0-9]*:../../graphics/scrot
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "NetBSD"
+DEPENDS+=	alsa-utils-[0-9]*:../../audio/alsa-utils
+.endif
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/sowm
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/sowm/PLIST b/wm/sowm/PLIST
new file mode 100644
index 000000000000..1edffdab4553
--- /dev/null
+++ b/wm/sowm/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2020/04/12 17:32:45 pin Exp $
+bin/sowm
+share/doc/sowm/README.md
diff --git a/wm/sowm/distinfo b/wm/sowm/distinfo
new file mode 100644
index 000000000000..42977db6ff19
--- /dev/null
+++ b/wm/sowm/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/04/12 17:32:45 pin Exp $
+
+SHA1 (sowm-1.6.tar.gz) = 87bd3f40ae70364c15f8e36c78c95e146d1423ac
+RMD160 (sowm-1.6.tar.gz) = f1f5ec85623335214e9e89fc2ce2e48a74679415
+SHA512 (sowm-1.6.tar.gz) = 36f0818d769c224c727713d862201dee7478a04e99c4b0ea0e48a1e1a12a033f704962351ec39df901c196a0ab75fd07b0551b6177f3bb51639dc1ea362b0c16
+Size (sowm-1.6.tar.gz) = 5916 bytes
+SHA1 (patch-config.def.h) = 8ea95b69bc52f4913dce9a7650cae1739bfd1400
diff --git a/wm/sowm/patches/patch-config.def.h b/wm/sowm/patches/patch-config.def.h
new file mode 100644
index 000000000000..d62999537945
--- /dev/null
+++ b/wm/sowm/patches/patch-config.def.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-config.def.h,v 1.1 2020/04/12 17:32:45 pin Exp $
+
+Use mixerctl instead of amixer on NetBSD
+Use scrot instead of scr as no scr is provided by pkg scrot
+
+--- config.def.h.orig	2020-02-21 16:08:47.000000000 +0000
++++ config.def.h
+@@ -5,12 +5,18 @@
+ 
+ const char* menu[]    = {"dmenu_run",      0};
+ const char* term[]    = {"st",             0};
+-const char* scrot[]   = {"scr",            0};
++const char* scrot[]   = {"scrot",          0};
+ const char* briup[]   = {"bri", "10", "+", 0};
+ const char* bridown[] = {"bri", "10", "-", 0};
++#if defined (__NetBSD__)
++const char* volup[] = {"mixerctl", "-w", "outputs.master+=5", 0};
++const char* voldown[] = {"mixerctl", "-w", "outputs.master-=5", 0};
++const char* volmute[] = {"mixerctl", "-w", "outputs.master=0", 0};
++#elif
+ const char* voldown[] = {"amixer", "sset", "Master", "5%-",         0};
+ const char* volup[]   = {"amixer", "sset", "Master", "5%+",         0};
+ const char* volmute[] = {"amixer", "sset", "Master", "toggle",      0};
++#endif
+ const char* colors[]  = {"bud", "/home/goldie/Pictures/Wallpapers", 0};
+ 
+ static struct key keys[] = {