diff --git a/README.md b/README.md
index 2691418..249ed4f 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Simplify developers' lives by abstracting template rendering for multiple templa
| Crikey | .crikey | [crikey](https://github.com/domgetter/crikey) | [@domgetter](https://github.com/domgetter) |
| Liquid | .liquid | [liquid](https://github.com/TechMagister/liquid.cr) | [@docelic](https://github.com/docelic) |
| Jbuilder | .jbuilder | [jbuilder](https://github.com/shootingfly/jbuilder) | [@shootingfly](https://github.com/shootingfly) |
+| Water | .water | [water](https://github.com/shootingfly/water) | [@shootingfly](https://github.com/shootingfly) |
See also:
[Registering your own template engine](#registering-your-own-template-engine).
diff --git a/shard.yml b/shard.yml
index e67e0f7..6f085d4 100644
--- a/shard.yml
+++ b/shard.yml
@@ -17,3 +17,5 @@ development_dependencies:
github: TechMagister/liquid.cr
jbuilder:
github: shootingfly/jbuilder
+ water:
+ github: shootingfly/water
diff --git a/spec/fixtures/test.water b/spec/fixtures/test.water
new file mode 100644
index 0000000..c0ff101
--- /dev/null
+++ b/spec/fixtures/test.water
@@ -0,0 +1 @@
+span Process.pid
\ No newline at end of file
diff --git a/spec/kilt/water_spec.cr b/spec/kilt/water_spec.cr
new file mode 100644
index 0000000..274071d
--- /dev/null
+++ b/spec/kilt/water_spec.cr
@@ -0,0 +1,18 @@
+require "../spec_helper"
+require "../../src/water"
+
+class WaterView
+ Kilt.file "spec/fixtures/test.water"
+end
+
+describe "kilt/water" do
+
+ it "renders water" do
+ Kilt.render("spec/fixtures/test.water").should eq("#{Process.pid}")
+ end
+
+ it "works with class" do
+ WaterView.new.to_s.should eq("#{Process.pid}")
+ end
+
+end
diff --git a/src/water.cr b/src/water.cr
new file mode 100644
index 0000000..383cca7
--- /dev/null
+++ b/src/water.cr
@@ -0,0 +1,4 @@
+require "./kilt"
+require "water"
+
+Kilt.register_engine "water", Water.embed