diff --git a/.gitignore b/.gitignore
index e481148..6be3080 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,61 @@
-SOURCES/INIT.2012-08-01.tgz
-SOURCES/ast-ksh.2012-08-01.tgz
-/INIT.2012-08-01.tgz
+ast-ksh.2010-07-01.tgz
+INIT.2010-07-01.tgz
+/ast-ksh.2010-08-11.tgz
+/INIT.2010-08-11.tgz
+/ast-ksh.2010-08-26.tgz
+/INIT.2010-08-26.tgz
+/ast-ksh.2010-09-24.tgz
+/INIT.2010-09-24.tgz
+/ast-ksh.2010-10-10.tgz
+/INIT.2010-10-10.tgz
+/ast-ksh.2010-10-26.tgz
+/INIT.2010-10-26.tgz
+/ast-ksh.2010-11-22.tgz
+/INIT.2010-11-22.tgz
+/ast-ksh.2010-12-01.tgz
+/INIT.2010-12-01.tgz
+/ast-ksh.2010-12-12.tgz
+/INIT.2010-12-12.tgz
+/ast-ksh.2011-01-04.tgz
+/INIT.2011-01-04.tgz
+/ast-ksh.2011-01-18.tgz
+/INIT.2011-01-18.tgz
+/ast-ksh.2011-01-27.tgz
+/INIT.2011-01-27.tgz
+/ast-ksh.2011-01-31.tgz
+/INIT.2011-01-31.tgz
+/ast-ksh.2011-02-02.tgz
+/INIT.2011-02-02.tgz
+/ast-ksh.2011-02-08.tgz
+/INIT.2011-02-08.tgz
+/ast-ksh.2011-04-15.tgz
+/INIT.2011-04-15.tgz
+/ast-ksh.2011-04-28.tgz
+/INIT.2011-04-28.tgz
+/ast-ksh.2011-05-05.tgz
+/INIT.2011-05-05.tgz
+/ast-ksh.2011-06-30.tgz
+/INIT.2011-06-30.tgz
+/ast-ksh.2012-01-01.tgz
+/INIT.2012-01-01.tgz
+/ast-ksh.2012-02-02.tgz
+/INIT.2012-02-02.tgz
+/ast-ksh.2012-02-14.tgz
+/INIT.2012-02-14.tgz
+/ast-ksh.2012-02-29.tgz
+/INIT.2012-02-29.tgz
+/ast-ksh.2012-05-31.tgz
+/INIT.2012-05-31.tgz
+/ast-ksh.2012-06-12.tgz
+/INIT.2012-06-12.tgz
+/ast-ksh.2012-06-20.tgz
+/INIT.2012-06-20.tgz
+/ast-ksh.2012-06-26.tgz
+/INIT.2012-06-26.tgz
+/ast-ksh.2012-06-28.tgz
+/INIT.2012-06-28.tgz
+/ast-ksh.2012-07-27.tgz
+/INIT.2012-07-27.tgz
 /ast-ksh.2012-08-01.tgz
+/INIT.2012-08-01.tgz
+/ast-ksh.2012-08-01b.tgz
diff --git a/ksh-20120801-noexeccdfix.patch b/ksh-20120801-noexeccdfix.patch
new file mode 100644
index 0000000..47128e0
--- /dev/null
+++ b/ksh-20120801-noexeccdfix.patch
@@ -0,0 +1,40 @@
+From b8260293a8ed7849a358291faae7b58f4a05dcc9 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 10 Nov 2014 18:23:34 +0100
+Subject: [PATCH] Resolves: #1160923 - handle failure of fchdir()
+
+... and chdir()
+---
+ src/cmd/ksh93/bltins/cd_pwd.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/cmd/ksh93/bltins/cd_pwd.c b/src/cmd/ksh93/bltins/cd_pwd.c
+index a972da6..c20959c 100644
+--- a/src/cmd/ksh93/bltins/cd_pwd.c
++++ b/src/cmd/ksh93/bltins/cd_pwd.c
+@@ -329,18 +329,20 @@ int	b_cd(int argc, char *argv[],Shbltin_t *context)
+ 		if(newdirfd >=0)
+ 		{
+ 			/* chdir for directories on HSM/tapeworms may take minutes */
+-			if(fchdir(newdirfd) >= 0)
++			if((rval=fchdir(newdirfd)) >= 0)
+ 			{
+ 				if(shp->pwdfd >= 0)
+ 					sh_close(shp->pwdfd);
+ 				shp->pwdfd=newdirfd;
+ 				goto success;
+ 			}
++			else
++				sh_close(newdirfd);
+ 		}
+ #ifndef O_SEARCH
+ 		else
+ 		{
+-			if(chdir(dir) >=0)
++			if((rval=chdir(dir)) >=0)
+ 			{
+ 				if(shp->pwdfd >= 0)
+ 				{
+-- 
+2.1.0
+
diff --git a/sources b/sources
index 692d1ab..bdff83f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (INIT.2012-08-01.tgz) = 4a598e862ecaf9e5bd820f54404f3898b8f3c0fe95f4820a79565ae3c5fc973e3010b7d475dfb762ad716a3e4fb5ab9d184e20bfcec889ce742c3ff30d0233c4
 SHA512 (ast-ksh.2012-08-01.tgz) = 244df8c4cbcd719da24bfc6e52272488e0a06a7274725cb7490db183a021a7c035a305c2c3682b8cddc84bb14ac7f31903ef46c59ff32bcb19317b3b05fa9353
+SHA512 (INIT.2012-08-01.tgz) = 4a598e862ecaf9e5bd820f54404f3898b8f3c0fe95f4820a79565ae3c5fc973e3010b7d475dfb762ad716a3e4fb5ab9d184e20bfcec889ce742c3ff30d0233c4
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..e483864
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,36 @@
+---
+
+# Tests that run in classic context
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/shell.git"
+      dest: "shell"
+      fmf_filter: "tier: 1, 2 & tags: classic"
+    environment:
+      PACKAGES: ksh
+      SH_BIN: ksh
+    required_packages:
+    - ksh
+    - expect            # login requires expect
+    - which             # smoke requires which
+
+# Tests that run in container
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - container
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/shell.git"
+      dest: "shell"
+      fmf_filter: "tier: 1, 2 & tags: container, atomic"
+    environment:
+      PACKAGES: ksh
+      SH_BIN: ksh
+    required_packages:
+    - ksh
+    - which             # smoke requires which