diff --git a/fs/Makefile b/fs/Makefile
index 33e6b315c69..0c725060413 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -48,7 +48,6 @@ include vfs/Make.defs
 include driver/Make.defs
 include dirent/Make.defs
 include aio/Make.defs
-include syslog/Make.defs
 include mmap/Make.defs
 
 # OS resources
diff --git a/fs/driver/Make.defs b/fs/driver/Make.defs
index 1a7ea9e558f..587076daeb8 100644
--- a/fs/driver/Make.defs
+++ b/fs/driver/Make.defs
@@ -41,6 +41,14 @@ CSRCS += fs_registerdriver.c fs_unregisterdriver.c
 CSRCS += fs_registerblockdriver.c fs_unregisterblockdriver.c
 CSRCS += fs_findblockdriver.c fs_openblockdriver.c fs_closeblockdriver.c
 
+# System logging to a character device (or file)
+
+ifeq ($(CONFIG_SYSLOG),y)
+ifeq ($(CONFIG_SYSLOG_CHAR),y)
+CSRCS += fs_devsyslog.c
+endif
+endif
+
 # Include driver build support
 
 DEPPATH += --dep-path driver
diff --git a/fs/syslog/fs_devsyslog.c b/fs/driver/fs_devsyslog.c
similarity index 99%
rename from fs/syslog/fs_devsyslog.c
rename to fs/driver/fs_devsyslog.c
index 930c89be4ca..526a9e0b289 100644
--- a/fs/syslog/fs_devsyslog.c
+++ b/fs/driver/fs_devsyslog.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/syslog/fs_devsyslog.c
+ * fs/driver/fs_devsyslog.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/libc/Makefile b/libc/Makefile
index 8412f8d884a..b1082dd514d 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -65,6 +65,7 @@ include stdio/Make.defs
 include stdlib/Make.defs
 include unistd/Make.defs
 include sched/Make.defs
+include syslog/Make.defs
 include string/Make.defs
 include aio/Make.defs
 include pthread/Make.defs
diff --git a/fs/syslog/Make.defs b/libc/syslog/Make.defs
similarity index 89%
rename from fs/syslog/Make.defs
rename to libc/syslog/Make.defs
index d67f63e1f31..7ebdc907cf5 100644
--- a/fs/syslog/Make.defs
+++ b/libc/syslog/Make.defs
@@ -35,18 +35,10 @@
 
 # Add the internal C files to the build
 
-CSRCS += fs_syslog.c fs_lowsyslog.c fs_setlogmask.c
+CSRCS += lib_syslog.c lib_lowsyslog.c lib_setlogmask.c
 
 ifeq ($(CONFIG_SYSLOG),y)
-CSRCS += fs_syslogstream.c
-endif
-
-# System logging to a character device (or file)
-
-ifeq ($(CONFIG_SYSLOG),y)
-ifeq ($(CONFIG_SYSLOG_CHAR),y)
-CSRCS += fs_devsyslog.c
-endif
+CSRCS += lib_syslogstream.c
 endif
 
 # Add the syslog directory to the build
diff --git a/fs/syslog/fs_lowsyslog.c b/libc/syslog/lib_lowsyslog.c
similarity index 99%
rename from fs/syslog/fs_lowsyslog.c
rename to libc/syslog/lib_lowsyslog.c
index 3caa81d8ae4..ed0315f6b85 100644
--- a/fs/syslog/fs_lowsyslog.c
+++ b/libc/syslog/lib_lowsyslog.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/syslog/fs_lowsyslog.c
+ * lib/syslog/lib_lowsyslog.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/fs/syslog/fs_setlogmask.c b/libc/syslog/lib_setlogmask.c
similarity index 99%
rename from fs/syslog/fs_setlogmask.c
rename to libc/syslog/lib_setlogmask.c
index d34341723ba..3645dceed12 100644
--- a/fs/syslog/fs_setlogmask.c
+++ b/libc/syslog/lib_setlogmask.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * fs/syslog/fs_setlogmask.c
+ * lib/syslog/lib_setlogmask.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/fs/syslog/fs_syslog.c b/libc/syslog/lib_syslog.c
similarity index 99%
rename from fs/syslog/fs_syslog.c
rename to libc/syslog/lib_syslog.c
index cb5e9625633..05cfe60eabf 100644
--- a/fs/syslog/fs_syslog.c
+++ b/libc/syslog/lib_syslog.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/syslog/fs_syslog.c
+ * libc/syslog/lib_syslog.c
  *
  *   Copyright (C) 2007-2009, 2011-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/fs/syslog/fs_syslogstream.c b/libc/syslog/lib_syslogstream.c
similarity index 100%
rename from fs/syslog/fs_syslogstream.c
rename to libc/syslog/lib_syslogstream.c
diff --git a/fs/syslog/syslog.h b/libc/syslog/syslog.h
similarity index 100%
rename from fs/syslog/syslog.h
rename to libc/syslog/syslog.h