diff --git a/sysdeps/osf1/.cvsignore b/sysdeps/osf1/.cvsignore
index 33eef0e1..af2b88a8 100644
--- a/sysdeps/osf1/.cvsignore
+++ b/sysdeps/osf1/.cvsignore
@@ -6,7 +6,6 @@ close.lo
 cpu.lo
 libgtop_sysdeps.la
 libsysdeps.la
-loadavg.c
 loadavg.lo
 mem.lo
 msg_limits.lo
@@ -16,6 +15,5 @@ sem_limits.lo
 shm_limits.lo
 swap.lo
 sysdeps.lo
-uptime.c
 uptime.lo
 so_locations
diff --git a/sysdeps/osf1/loadavg.c b/sysdeps/osf1/loadavg.c
new file mode 100644
index 00000000..4759279c
--- /dev/null
+++ b/sysdeps/osf1/loadavg.c
@@ -0,0 +1,63 @@
+/* $Id$ */
+
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the Gnome Top Library.
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   The Gnome Top Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Top Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <config.h>
+#include <glibtop/error.h>
+#include <glibtop/loadavg.h>
+
+static const unsigned long _glibtop_sysdeps_loadavg =
+(1 << GLIBTOP_LOADAVG_LOADAVG);
+
+/* Provides load averange. */
+
+void
+glibtop_get_loadavg__r (glibtop *server, glibtop_loadavg *buf)
+{
+	struct tbl_loadavg loadavg;
+	int ret;
+
+	glibtop_init ();
+
+	memset (buf, 0, sizeof (glibtop_loadavg));
+	
+	ret = table (TBL_LOADAVG, 0, (char *) &loadavg, 1,
+		     sizeof (struct tbl_loadavg)); 
+
+	if (ret != 1) return;
+
+	buf->flags = _glibtop_sysdeps_loadavg;
+		
+	if (loadavg.tl_lscale == 0) {
+		buf->loadavg [0] = loadavg.tl_avenrun.d [0];
+		buf->loadavg [1] = loadavg.tl_avenrun.d [1];
+		buf->loadavg [2] = loadavg.tl_avenrun.d [2];
+	} else {
+		buf->loadavg [0] = 
+			(double) loadavg.tl_avenrun.l [0] /
+			(double) loadavg.tl_mach_factor [0];
+		buf->loadavg [1] =
+			(double) loadavg.tl_avenrun.l [1] 
+			/ (double) loadavg.tl_mach_factor [1];
+		buf->loadavg [2] =
+			(double) loadavg.tl_avenrun.l [2] /
+			(double) loadavg.tl_mach_factor [2];
+	}
+}
diff --git a/sysdeps/osf1/uptime.c b/sysdeps/osf1/uptime.c
new file mode 100644
index 00000000..f455ef30
--- /dev/null
+++ b/sysdeps/osf1/uptime.c
@@ -0,0 +1,51 @@
+/* $Id$ */
+
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the Gnome Top Library.
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   The Gnome Top Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Top Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/uptime.h>
+
+#include <time.h>
+
+static unsigned long _glibtop_sysdeps_uptime =
+(1 << GLIBTOP_UPTIME_UPTIME);
+
+/* Provides uptime and idle time. */
+
+void
+glibtop_get_uptime__r (glibtop *server, glibtop_uptime *buf)
+{
+	struct tbl_sysinfo sysinfo;
+	int ret;
+	
+	glibtop_init ();
+
+	memset (buf, 0, sizeof (glibtop_uptime));
+	
+	ret = table (TBL_SYSINFO, 0, (char *) &sysinfo, 1,
+		     sizeof (struct tbl_sysinfo)); 
+
+	if (ret != 1) return;
+		
+	buf->uptime = (double) (time (NULL) - sysinfo.si_boottime);
+
+	buf->flags = _glibtop_sysdeps_uptime;
+}