diff --git a/libc/Makefile b/libc/Makefile
index fb5a776e..c93e47a5 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -288,9 +288,9 @@ netdb/setprotoent.o \
 netdb/setservent.o \
 pathconf.o \
 pipe.o \
-poll.o \
+poll/poll.o \
+poll/ppoll.o \
 popen.o \
-ppoll.o \
 preadv.o \
 print.o \
 psignal.o \
diff --git a/libc/poll.cpp b/libc/poll/poll.cpp
similarity index 98%
rename from libc/poll.cpp
rename to libc/poll/poll.cpp
index d9048840..38a65e18 100644
--- a/libc/poll.cpp
+++ b/libc/poll/poll.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    poll.cpp
+    poll/poll.cpp
     Input/output multiplexing.
 
 *******************************************************************************/
diff --git a/libc/ppoll.cpp b/libc/poll/ppoll.cpp
similarity index 98%
rename from libc/ppoll.cpp
rename to libc/poll/ppoll.cpp
index ddbf9fdd..5a9968ec 100644
--- a/libc/ppoll.cpp
+++ b/libc/poll/ppoll.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    ppoll.cpp
+    poll/ppoll.cpp
     Input/output multiplexing.
 
 *******************************************************************************/