diff --git a/c/rail-fence-cipher/GNUmakefile b/c/rail-fence-cipher/GNUmakefile
new file mode 100644
index 0000000..ec085d0
--- /dev/null
+++ b/c/rail-fence-cipher/GNUmakefile
@@ -0,0 +1,51 @@
+# The original 'makefile' has a flaw:
+# 1) it overrides CFLAGS
+# 2) it does not pass extra "FLAGS" to $(CC) that could come from environment
+#
+# It means :
+# - we need to edit 'makefile' for different builds (DEBUG, etc...), which is
+#   not practical at all.
+# - Also, it does not allow to run all tests without editing the test source
+#   code.
+#
+# To use this makefile (GNU make only):
+#   "make": build with all predefined tests (without editing test source code)
+#   "make debugall": build with all predefined tests and debug code
+#   "make mem": perform memcheck with all tests enabled
+#   "make unit": build standalone (unit) test
+#   "make debug": build standalone test with debugging code
+#
+# Original 'makefile' targets can be used (test, memcheck, clean, ...)
+
+.PHONY: default all mem unit debug std debugtest
+
+default: all
+
+# default is to build with all predefined tests
+BUILD := teststall
+
+include makefile
+
+all: CFLAGS+=-DTESTALL
+all: clean test
+
+debugall: CFLAGS+=-DDEBUG
+debugall: all
+
+debugtest: CFLAGS+=-DDEBUG
+debugtest: test
+
+mem: CFLAGS+=-DTESTALL
+mem: clean memcheck
+
+unit: CFLAGS+=-DUNIT_TEST
+unit: clean std
+
+debug: CFLAGS+=-DUNIT_TEST -DDEBUG
+debug: clean std
+
+debugtest: CFLAGS+=-DDEBUG
+debugtest: test
+
+std: src/*.c src/*.h
+	$(CC) $(CFLAGS) src/*.c -o test.out
diff --git a/c/rail-fence-cipher/README.md b/c/rail-fence-cipher/README.md
new file mode 100644
index 0000000..bbc60be
--- /dev/null
+++ b/c/rail-fence-cipher/README.md
@@ -0,0 +1,97 @@
+# Rail Fence Cipher
+
+Implement encoding and decoding for the rail fence cipher.
+
+The Rail Fence cipher is a form of transposition cipher that gets its name from
+the way in which it's encoded. It was already used by the ancient Greeks.
+
+In the Rail Fence cipher, the message is written downwards on successive "rails"
+of an imaginary fence, then moving up when we get to the bottom (like a zig-zag).
+Finally the message is then read off in rows.
+
+For example, using three "rails" and the message "WE ARE DISCOVERED FLEE AT ONCE",
+the cipherer writes out:
+
+```text
+W . . . E . . . C . . . R . . . L . . . T . . . E
+. E . R . D . S . O . E . E . F . E . A . O . C .
+. . A . . . I . . . V . . . D . . . E . . . N . .
+```
+
+Then reads off:
+
+```text
+WECRLTEERDSOEEFEAOCAIVDEN
+```
+
+To decrypt a message you take the zig-zag shape and fill the ciphertext along the rows.
+
+```text
+? . . . ? . . . ? . . . ? . . . ? . . . ? . . . ?
+. ? . ? . ? . ? . ? . ? . ? . ? . ? . ? . ? . ? .
+. . ? . . . ? . . . ? . . . ? . . . ? . . . ? . .
+```
+
+The first row has seven spots that can be filled with "WECRLTE".
+
+```text
+W . . . E . . . C . . . R . . . L . . . T . . . E
+. ? . ? . ? . ? . ? . ? . ? . ? . ? . ? . ? . ? .
+. . ? . . . ? . . . ? . . . ? . . . ? . . . ? . .
+```
+
+Now the 2nd row takes "ERDSOEEFEAOC".
+
+```text
+W . . . E . . . C . . . R . . . L . . . T . . . E
+. E . R . D . S . O . E . E . F . E . A . O . C .
+. . ? . . . ? . . . ? . . . ? . . . ? . . . ? . .
+```
+
+Leaving "AIVDEN" for the last row.
+
+```text
+W . . . E . . . C . . . R . . . L . . . T . . . E
+. E . R . D . S . O . E . E . F . E . A . O . C .
+. . A . . . I . . . V . . . D . . . E . . . N . .
+```
+
+If you now read along the zig-zag shape you can read the original message.
+
+## Getting Started
+
+Make sure you have read the "Guides" section of the
+[C track][c-track] on the Exercism site. This covers
+the basic information on setting up the development environment expected
+by the exercises.
+
+## Passing the Tests
+
+Get the first test compiling, linking and passing by following the [three
+rules of test-driven development][3-tdd-rules].
+
+The included makefile can be used to create and run the tests using the `test`
+task.
+
+    make test
+
+Create just the functions you need to satisfy any compiler errors and get the
+test to fail. Then write just enough code to get the test to pass. Once you've
+done that, move onto the next test.
+
+As you progress through the tests, take the time to refactor your
+implementation for readability and expressiveness and then go on to the next
+test.
+
+Try to use standard C99 facilities in preference to writing your own
+low-level algorithms or facilities by hand.
+
+## Source
+
+Wikipedia [https://en.wikipedia.org/wiki/Transposition_cipher#Rail_Fence_cipher](https://en.wikipedia.org/wiki/Transposition_cipher#Rail_Fence_cipher)
+
+## Submitting Incomplete Solutions
+It's possible to submit an incomplete solution so you can see how others have completed the exercise.
+
+[c-track]: https://exercism.io/my/tracks/c
+[3-tdd-rules]: http://butunclebob.com/ArticleS.UncleBob.TheThreeRulesOfTdd
diff --git a/c/rail-fence-cipher/makefile b/c/rail-fence-cipher/makefile
new file mode 100644
index 0000000..05a5cad
--- /dev/null
+++ b/c/rail-fence-cipher/makefile
@@ -0,0 +1,34 @@
+### If you wish to use extra libraries (math.h for instance),
+### add their flags here (-lm in our case) in the "LIBS" variable.
+
+LIBS = -lm
+
+###
+CFLAGS  = -std=c99
+CFLAGS += -g
+CFLAGS += -Wall
+CFLAGS += -Wextra
+CFLAGS += -pedantic
+CFLAGS += -Werror
+CFLAGS += -Wmissing-declarations
+CFLAGS += -DUNITY_SUPPORT_64
+
+ASANFLAGS  = -fsanitize=address
+ASANFLAGS += -fno-common
+ASANFLAGS += -fno-omit-frame-pointer
+
+test: tests.out
+	@./tests.out
+
+memcheck: test/*.c src/*.c src/*.h
+	@echo Compiling $@
+	@$(CC) $(ASANFLAGS) $(CFLAGS) src/*.c test/vendor/unity.c test/*.c -o memcheck.out $(LIBS)
+	@./memcheck.out
+	@echo "Memory check passed"
+
+clean:
+	rm -rf *.o *.out *.out.dSYM
+
+tests.out: test/*.c src/*.c src/*.h
+	@echo Compiling $@
+	@$(CC) $(CFLAGS) src/*.c test/vendor/unity.c test/*.c -o tests.out $(LIBS)
diff --git a/c/rail-fence-cipher/src/rail_fence_cipher.c b/c/rail-fence-cipher/src/rail_fence_cipher.c
new file mode 100644
index 0000000..63c9a94
--- /dev/null
+++ b/c/rail-fence-cipher/src/rail_fence_cipher.c
@@ -0,0 +1,57 @@
+#include "rail_fence_cipher.h"
+#include <malloc.h>
+#include <string.h>
+#include <stdbool.h>
+
+/* See GNUmakefile below explanation
+ * https://github.com/braoult/exercism/blob/master/c/templates/GNUmakefile
+ */
+#if defined UNIT_TEST || defined DEBUG
+#include <stdio.h>
+#include <stdlib.h>
+#endif
+
+char *doit(char *t, size_t nr, int what)
+{
+    int tlen=strlen(t);
+    unsigned cchar=0, r;
+    char *res;
+
+    if (!(res=malloc(tlen+1)))
+        return NULL;
+    for (r=0; r<nr; ++r) {
+        bool flip=false;
+        int pchar=r;
+        while (pchar<tlen) {
+            if (what==ENCODE)
+                res[cchar]=t[pchar];
+            else
+                res[pchar]=t[cchar];
+            cchar++;
+            if (r>0 && r<nr-1) {
+                pchar+=flip ? r*2: (nr-r-1)*2;
+                flip=!flip;
+            } else {
+                pchar+=(nr-1)*2;
+            }
+
+        }
+    }
+    res[tlen]=0;
+    return res;
+}
+
+#ifdef UNIT_TEST
+int main(int ac, char **av)
+{
+    int arg=1;
+    int i;
+    char *p, *q;
+    for (; arg<ac-1; ++arg, ++arg) {
+        p=av[arg];
+        i=atoi(av[arg+1]);
+        printf("encode(%s, %d)=%s\n", p, i, q=encode(p, i));
+        printf("decode(%s, %d)=%s\n", q, i, decode(q, i));
+    }
+}
+#endif
diff --git a/c/rail-fence-cipher/src/rail_fence_cipher.h b/c/rail-fence-cipher/src/rail_fence_cipher.h
new file mode 100644
index 0000000..b3cd489
--- /dev/null
+++ b/c/rail-fence-cipher/src/rail_fence_cipher.h
@@ -0,0 +1,22 @@
+#ifndef RAIL_FENCE_CIPHER_H
+#define RAIL_FENCE_CIPHER_H
+
+#include <stddef.h>
+
+#define ENCODE 0
+#define DECODE 1
+
+char *doit(char *text, size_t rails, int action);
+
+#define encode(t, r) doit(t, r, ENCODE)
+#define decode(t, r) doit(t, r, DECODE)
+
+/* See GNUmakefile below for explanation
+ * https://github.com/braoult/exercism/blob/master/c/templates/GNUmakefile
+ */
+#ifdef  TESTALL
+#undef  TEST_IGNORE
+#define TEST_IGNORE() {}
+#endif
+
+#endif