diff --git a/ChangeLog b/ChangeLog
index 0451a8adc..8a838bb21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-26  Robert Love  <rml@novell.com>
+
+	* tests/nm-online.c: New file.  Simple utility that returns exit status
+	  noting whether the connection is offline or online.  If offline on
+	  start, it waits 60 seconds (or a command-line given value) for an
+	  online signal.  If it times out, it again returns offline.  This is
+	  useful for scripts that want to wait for network connections.
+
 2006-04-25  Robert Love  <rml@novell.com>
 
 	* src/nm-ap-security-wep.c: Bug fix: We stopped setting the
diff --git a/test/Makefile.am b/test/Makefile.am
index cc68e954c..91a4ca4ac 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,12 +13,15 @@ AM_CPPFLAGS =						\
 	-DBINDIR=\"$(bindir)\"			\
 	-DDATADIR=\"$(datadir)\"
 
-noinst_PROGRAMS = nm-tool nminfotest nmtestdevices libnm_glib_test
+noinst_PROGRAMS = nm-tool nm-online nminfotest nmtestdevices libnm_glib_test
 
 nm_tool_SOURCES = nm-tool.c
 nm_tool_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)	\
 		$(top_builddir)/utils/libnmutils.la
 
+nm_online_SOURCES = nm-online.c
+nm_online_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)	\
+		$(top_builddir)/utils/libnmutils.la
 
 nminfotest_SOURCES = nminfotest.c
 nminfotest_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS)	\