diff --git a/veejay-current/plugin-packs/lvdgmic/src/Makefile b/veejay-current/plugin-packs/lvdgmic/src/Makefile
index b8cc8787..9e27941d 100644
--- a/veejay-current/plugin-packs/lvdgmic/src/Makefile
+++ b/veejay-current/plugin-packs/lvdgmic/src/Makefile
@@ -9,8 +9,9 @@ PENCILBW_SO=gmic_pencilbw.so
 ARRAYFADE_SO=gmic_arrayfade.so
 PENCILPORTRAIT_SO=gmic_pencilportrait.so
 RODILIUS_SO=gmic_rodilius.so
+WATER_SO=gmic_water.so
 
-all: $(CARTOON_SO) $(BOKEY_SO) $(PENCILBW_SO) $(ARRAYFADE_SO) $(RODILIUS_SO)
+all: $(CARTOON_SO) $(BOKEY_SO) $(PENCILBW_SO) $(ARRAYFADE_SO) $(RODILIUS_SO) $(WATER_SO)
 default:all
 
 %.o: %.cc
@@ -39,7 +40,11 @@ $(RODILIUS_SO): $(OBJS) gmic_rodilius.o
 	$(CC) $(OBJS) $(LDFLAGS) -o $@
 	$(CC) $(CFLAGS) -shared $^ -lgmic -o $@
 
+$(WATER_SO): $(OBJS) gmic_water.o
+	$(CC) $(OBJS) $(LDFLAGS) -o $@
+	$(CC) $(CFLAGS) -shared $^ -lgmic -o $@
+
 
 clean:
 	rm -f *.o
-	rm -f $(CARTOON_SO) $(BOKEY_SO) $(PENCLIBW_SO) $(ARRAYFADE_SO) $(RODILIUS_SO)
+	rm -f $(CARTOON_SO) $(BOKEY_SO) $(PENCLIBW_SO) $(ARRAYFADE_SO) $(RODILIUS_SO) $(WATER_SO)
diff --git a/veejay-current/plugin-packs/lvdgmic/src/gmic_water.c b/veejay-current/plugin-packs/lvdgmic/src/gmic_water.c
new file mode 100644
index 00000000..c7ce9e7b
--- /dev/null
+++ b/veejay-current/plugin-packs/lvdgmic/src/gmic_water.c
@@ -0,0 +1,168 @@
+/* 
+ * LIBVJE - veejay fx library
+ *
+ * Copyright(C)2015 Niels Elburg <nwelburg@gmail.com>
+ * See COPYING for software license and distribution details
+ *
+ * GMIC Water, intially ported to livido by Michael John Hornyak 
+ *
+ */
+
+#ifndef IS_LIVIDO_PLUGIN
+#define IS_LIVIDO_PLUGIN
+#endif
+
+#include 	"livido.h"
+LIVIDO_PLUGIN
+#include	"utils.h"
+#include	"livido-utils.c"
+#include 	"lvd_common.h"
+#include	"lvdgmicglue.h"
+
+livido_init_f	init_instance( livido_port_t *my_instance )
+{
+	Clvdgmic *gmic = lvdgmic_new(1);
+
+	livido_property_set( my_instance, "PLUGIN_private",
+			LIVIDO_ATOM_TYPE_VOIDPTR,1,&gmic );
+
+	return LIVIDO_NO_ERROR;
+}
+
+
+livido_deinit_f	deinit_instance( livido_port_t *my_instance )
+{
+	Clvdgmic *gmic = NULL;
+	livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
+	lvdgmic_delete(gmic);
+
+	return LIVIDO_NO_ERROR;
+}
+
+
+livido_process_f		process_instance( livido_port_t *my_instance, double timecode )
+{
+	int len =0;
+	int i = 0;
+	uint8_t *A[4] = {NULL,NULL,NULL,NULL};
+	uint8_t *O[4]= {NULL,NULL,NULL,NULL};
+	char *cmd[256];
+	int palette;
+	int w;
+	int h;
+	
+	int error	  = lvd_extract_channel_values( my_instance, "out_channels", 0, &w,&h, O,&palette );
+	if( error != LIVIDO_NO_ERROR )
+		return LIVIDO_ERROR_HARDWARE; 
+	Clvdgmic *gmic = NULL;
+	livido_property_get( my_instance, "PLUGIN_private",0, &gmic);
+	
+        lvd_extract_channel_values( my_instance, "in_channels" , 0, &w, &h, A, &palette );
+
+	int uv_len = lvd_uv_plane_len( palette,w,h );
+	len = w * h;
+
+	int amplitude =  lvd_extract_param_index( my_instance,"in_parameters", 0 );
+	int smoothness = lvd_extract_param_index( my_instance,"in_parameters", 1 );
+	
+	snprintf(cmd,sizeof(cmd),"-water %d,%f", amplitude, (float)smoothness/100.0f);
+
+	lvdgmic_push( gmic, w, h, 0, A, 0);
+
+	lvdgmic_gmic( gmic, cmd );
+
+	lvdgmic_pull( gmic, 0, O );
+
+	return LIVIDO_NO_ERROR;
+}
+
+livido_port_t	*livido_setup(livido_setup_t list[], int version)
+
+{
+	LIVIDO_IMPORT(list);
+
+	livido_port_t *port = NULL;
+	livido_port_t *in_params[2];
+	livido_port_t *in_chans[3];
+	livido_port_t *out_chans[1];
+	livido_port_t *info = NULL;
+	livido_port_t *filter = NULL;
+
+	//@ setup root node, plugin info
+	info = livido_port_new( LIVIDO_PORT_TYPE_PLUGIN_INFO );
+	port = info;
+
+		livido_set_string_value( port, "maintainer", "Niels");
+		livido_set_string_value( port, "version","1");
+	
+	filter = livido_port_new( LIVIDO_PORT_TYPE_FILTER_CLASS );
+	livido_set_int_value( filter, "api_version", LIVIDO_API_VERSION );
+
+	//@ setup function pointers
+	livido_set_voidptr_value( filter, "deinit_func", &deinit_instance );
+	livido_set_voidptr_value( filter, "init_func", &init_instance );
+	livido_set_voidptr_value( filter, "process_func", &process_instance );
+	port = filter;
+
+	//@ meta information
+		livido_set_string_value( port, "name", "G'MIC/GREYs Water");	
+		livido_set_string_value( port, "description", "Apply water effect on image");
+		livido_set_string_value( port, "author", "GREYC's Magic for Image Computing"); 
+		
+		livido_set_int_value( port, "flags", 0);
+		livido_set_string_value( port, "license", "GPL2");
+		livido_set_int_value( port, "version", 1);
+	
+	//@ some palettes veejay-classic uses
+	int palettes0[] = {
+		LIVIDO_PALETTE_YUV422P,
+		LIVIDO_PALETTE_YUV444P,
+		LIVIDO_PALETTE_RGBFLOAT,
+		LIVIDO_PALETTE_A8,
+            	0,
+	};
+	
+	//@ setup output channel
+	out_chans[0] = livido_port_new( LIVIDO_PORT_TYPE_CHANNEL_TEMPLATE );
+	port = out_chans[0];
+	
+		livido_set_string_value( port, "name", "Output Channel");
+		livido_set_int_array( port, "palette_list", 3, palettes0);
+		livido_set_int_value( port, "flags", 0);
+
+        in_chans[0] = livido_port_new( LIVIDO_PORT_TYPE_CHANNEL_TEMPLATE );
+        port = in_chans[0];
+  		livido_set_string_value( port, "name", "Input Channel");
+       		livido_set_int_array( port, "palette_list", 4, palettes0);
+       		livido_set_int_value( port, "flags", 0);
+	
+	in_params[0] = livido_port_new( LIVIDO_PORT_TYPE_PARAMETER_TEMPLATE );
+	port = in_params[0];
+
+		livido_set_string_value(port, "name", "Amplitude" );
+		livido_set_string_value(port, "kind", "INDEX" );
+		livido_set_int_value( port, "min", 0 );
+		livido_set_int_value( port, "max", 300 );
+		livido_set_int_value( port, "default", 30 );
+		livido_set_string_value( port, "description" ,"Amplitude");
+
+	
+	in_params[1] = livido_port_new( LIVIDO_PORT_TYPE_PARAMETER_TEMPLATE );
+	port = in_params[1];
+
+		livido_set_string_value(port, "name", "Smoothness" );
+		livido_set_string_value(port, "kind", "INDEX" );
+		livido_set_int_value( port, "min", 0 );
+		livido_set_int_value( port, "max", 400 );
+		livido_set_int_value( port, "default", 150 );
+		livido_set_string_value( port, "description" ,"Smoothness");
+
+
+	//@ setup the nodes
+	livido_set_portptr_array( filter, "in_parameter_templates",2, in_params );
+	livido_set_portptr_array( filter, "out_channel_templates", 1, out_chans );
+        livido_set_portptr_array( filter, "in_channel_templates",1, in_chans );
+
+	livido_set_portptr_value(info, "filters", filter);
+	return info;
+}