diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
new file mode 100644
index 00000000000..b8c1edab2f9
--- /dev/null
+++ b/sysutils/uptimed/Makefile
@@ -0,0 +1,23 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2013/06/18 05:47:19 rfreeman Exp $
+
+COMMENT =	keeps a list of uptime records
+DISTNAME =	uptimed-0.3.17
+CATEGORIES =	sysutils
+
+SHARED_LIBS +=	uptimed                   0.0 # 0.0
+
+HOMEPAGE =	http://podgorny.cz/moin/Uptimed
+
+MAINTAINER =	Ryan Freeman <rfreeman@openbsd.org>
+
+# GPLv2
+PERMIT_PACKAGE_CDROM = Yes
+
+WANTLIB += c
+
+MASTER_SITES =	http://podgorny.cz/uptimed/releases/
+EXTRACT_SUFX =	.tar.bz2
+
+CONFIGURE_STYLE = gnu
+
+.include <bsd.port.mk>
diff --git a/sysutils/uptimed/distinfo b/sysutils/uptimed/distinfo
new file mode 100644
index 00000000000..acb59ddab47
--- /dev/null
+++ b/sysutils/uptimed/distinfo
@@ -0,0 +1,2 @@
+SHA256 (uptimed-0.3.17.tar.bz2) = UkzomEwNCngKMgJbo/+5gOXuw9eOZc9oyR7ex/6DOgY=
+SIZE (uptimed-0.3.17.tar.bz2) = 269102
diff --git a/sysutils/uptimed/patches/patch-libuptimed_urec_h b/sysutils/uptimed/patches/patch-libuptimed_urec_h
new file mode 100644
index 00000000000..9d2386f4bad
--- /dev/null
+++ b/sysutils/uptimed/patches/patch-libuptimed_urec_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-libuptimed_urec_h,v 1.1.1.1 2013/06/18 05:47:19 rfreeman Exp $
+--- libuptimed/urec.h.orig	Sun Jun 16 17:00:29 2013
++++ libuptimed/urec.h	Sun Jun 16 17:00:51 2013
+@@ -54,8 +54,8 @@ extern void snprintf(char *, ...);
+ 
+ #include "misc.h"
+ 
+-#define FILE_BOOTID "/var/spool/uptimed/bootid"
+-#define FILE_RECORDS "/var/spool/uptimed/records"
++#define FILE_BOOTID "/var/db/uptimed/bootid"
++#define FILE_RECORDS "/var/db/uptimed/records"
+ 
+ typedef struct urec {
+ 	time_t utime; /* uptime */
diff --git a/sysutils/uptimed/pkg/DESCR b/sysutils/uptimed/pkg/DESCR
new file mode 100644
index 00000000000..b4f8e8e3a3d
--- /dev/null
+++ b/sysutils/uptimed/pkg/DESCR
@@ -0,0 +1,2 @@
+uptimed keeps track of your uptime records, viewable with the included
+uprecords program.
diff --git a/sysutils/uptimed/pkg/PLIST b/sysutils/uptimed/pkg/PLIST
new file mode 100644
index 00000000000..4101e8562ac
--- /dev/null
+++ b/sysutils/uptimed/pkg/PLIST
@@ -0,0 +1,15 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2013/06/18 05:47:19 rfreeman Exp $
+@extraunexec rm -f /var/db/uptimed/*
+@newgroup _uptimed:717
+@newuser _uptimed:717:717:daemon:Uptimed Account:/var/db/transmission:/sbin/nologin
+@bin bin/uprecords
+lib/libuptimed.a
+lib/libuptimed.la
+@lib lib/libuptimed.so.${LIBuptimed_VERSION}
+@man man/man1/uprecords.1
+@man man/man8/uptimed.8
+@bin sbin/uptimed
+@owner _uptimed
+@sample /var/db/uptimed/
+@owner
+@rcscript ${RCDIR}/uptimed
diff --git a/sysutils/uptimed/pkg/uptimed.rc b/sysutils/uptimed/pkg/uptimed.rc
new file mode 100644
index 00000000000..f3c1641e984
--- /dev/null
+++ b/sysutils/uptimed/pkg/uptimed.rc
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $OpenBSD: uptimed.rc,v 1.1.1.1 2013/06/18 05:47:19 rfreeman Exp $
+
+daemon="${TRUEPREFIX}/sbin/uptimed"
+daemon_flags="-p /var/run/uptimed/uptimed.pid"
+daemon_user="_uptimed"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_pre() {
+	install -d -o _uptimed /var/run/uptimed
+}
+
+rc_cmd $1