diff --git a/Makefile.am b/Makefile.am
index f1a3a18..2ee97a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,11 @@
 obmcconsoledir = $(sysconfdir)/obmc-console
 obmcconsole_DATA = conf/server.ttyVUART0.conf
 
+if WITH_UDEV
+udevrulesddir = $(udevdir)/rules.d
+udevrulesd_DATA = conf/80-obmc-console-uart.rules
+endif
+
 if WITH_SYSTEMD
 systemdsystemunit_DATA = conf/obmc-console@.service \
 			 conf/obmc-console-ssh@.service
diff --git a/conf/80-obmc-console-uart.rules.in b/conf/80-obmc-console-uart.rules.in
new file mode 100644
index 0000000..1cb603a
--- /dev/null
+++ b/conf/80-obmc-console-uart.rules.in
@@ -0,0 +1,2 @@
+SUBSYSTEM=="tty", ATTRS{iomem_base}=="0x1E787000", ENV{SYSTEMD_WANTS}="obmc-console@ttyVUART0" SYMLINK+="ttyVUART0", TAG+="systemd"
+SUBSYSTEM=="tty", ATTRS{iomem_base}=="0x1E788000", ENV{SYSTEMD_WANTS}="obmc-console@ttyVUART1" SYMLINK+="ttyVUART1", TAG+="systemd"
diff --git a/configure.ac b/configure.ac
index 8f37250..045ea36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,14 @@
 # Checks for library functions.
 LT_INIT # Removes 'unrecognized options: --with-libtool-sysroot'
 
+AC_ARG_WITH([udevdir],
+        AS_HELP_STRING([--with-udevdir=DIR],  [Directory for udev rules]),
+        [], [with_udevdir=${prefix}$($PKG_CONFIG --variable=udevdir udev)])
+if test "x$with_udevdir" != xno; then
+    AC_SUBST([udevdir], [$with_udevdir])
+fi
+AM_CONDITIONAL(WITH_UDEV, [test -n "$with_udevdir" -a "x$with_udevdir" != xno ])
+
 AC_ARG_WITH([systemdsystemunitdir],
 	AS_HELP_STRING([--with-systemdsystemunitdir=DIR],  [Directory for systemd service files]),
 	[], [with_systemdsystemunitdir=${prefix}$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
@@ -63,6 +71,7 @@
 
 # Create configured output
 AC_CONFIG_FILES([
+                 conf/80-obmc-console-uart.rules
                  conf/client.2200.conf
                  conf/obmc-console@.service
                  conf/obmc-console-ssh@.service