Index: /libpipi/trunk/configure.ac
===================================================================
--- /libpipi/trunk/configure.ac	(revision 2692)
+++ /libpipi/trunk/configure.ac	(revision 2693)
@@ -100,4 +100,5 @@
   Makefile
   pipi/Makefile
+  src/Makefile
   genethumb/Makefile
   examples/Makefile
Index: /libpipi/trunk/.gitignore
===================================================================
--- /libpipi/trunk/.gitignore	(revision 2692)
+++ /libpipi/trunk/.gitignore	(revision 2693)
@@ -10,4 +10,5 @@
 libtool
 pipi/pipi.pc
+src/pipi
 genethumb/genethumb
 examples/blur
Index: /libpipi/trunk/src/pipi.c
===================================================================
--- /libpipi/trunk/src/pipi.c	(revision 2693)
+++ /libpipi/trunk/src/pipi.c	(revision 2693)
@@ -0,0 +1,37 @@
+#include "config.h"
+#include "common.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <pipi.h>
+
+int main(int argc, char *argv[])
+{
+    pipi_context_t *ctx;
+
+    ctx = pipi_create_context();
+
+    while(*++argv)
+    {
+        if(!strcmp(argv[0], "--output") || !strcmp(argv[0], "-o"))
+        {
+            if(argv[1] == NULL)
+                return EXIT_FAILURE;
+            if(pipi_command(ctx, "save", argv[1]) != 0)
+                return EXIT_FAILURE;
+            argv++;
+        }
+        else
+        {
+            if(pipi_command(ctx, "load", argv[0]) != 0)
+                return EXIT_FAILURE;
+        }
+    }
+
+    pipi_destroy_context(ctx);
+
+    return EXIT_SUCCESS;
+}
+
Index: /libpipi/trunk/src/Makefile.am
===================================================================
--- /libpipi/trunk/src/Makefile.am	(revision 2693)
+++ /libpipi/trunk/src/Makefile.am	(revision 2693)
@@ -0,0 +1,9 @@
+# $Id$
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/pipi
+
+bin_PROGRAMS = pipi
+
+pipi_SOURCES = pipi.c $(GETOPT)
+pipi_LDADD = ../pipi/libpipi.la $(GETOPT_LIBS)
+
Index: /libpipi/trunk/Makefile.am
===================================================================
--- /libpipi/trunk/Makefile.am	(revision 2692)
+++ /libpipi/trunk/Makefile.am	(revision 2693)
@@ -1,5 +1,5 @@
 # $Id$
 
-SUBDIRS = pipi genethumb examples test
+SUBDIRS = pipi src genethumb examples test
 
 EXTRA_DIST = bootstrap common.h