diff --git a/files/RPM-GPG-KEY-OPENAFS b/files/RPM-GPG-KEY-OPENAFS
new file mode 100644
index 0000000..10b72c6
--- /dev/null
+++ b/files/RPM-GPG-KEY-OPENAFS
@@ -0,0 +1,40 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (Darwin)
+
+mQGiBE95BwQRBADVcR2ml3DkqRatG06D1CpoXS47A9esx07sTLBUI/BF5/fqmwga
+RYYFUjoX0NT5fvdv/5+h4T4GVg5BxBa4WsJQ3OcSVtYCWhqvFPrNbgTl9ZiSVD03
+rfizIOnZ3zu8i3QAvvBioS7J2Q+WJvhs/sBOceY4hg/UDFCPQERUVLJjxwCggj+p
+6X+YE5rkBife0/Y9PsSqQWUD+QGmAm099du5DOSXUuQvClbqZtZZeozersCk3lyY
+Ld/7L3PPOjmxFcA+w3basdvUmYmROQV88zZd4em4HLKfklHwcFbtYjr/xRUkIa2o
+F90K/f444ovV+S8D2dflh9JKRRFbqNijsp5ymOqhWlZPKmeKgJlJHmN642fBFv5Z
+bq6vA/9Dzh/JS7kRCTWLQhbCK0FGp/8imxNpRflik1SF05lusK1nUH2cT9EUzZ7T
++nHF2968p42/vHASE8LFtobNj339rY1/1B0DxvYBKCUQjzPPyIcDTikTu3jaol+N
+jnTxwplEBY/oNF7vQxfPIHgjmXFKgXZCIJxd1aryHcWPFx0bmbQnR1BHdjMgUlBN
+IGJ1aWxkZXIgYXQgYmVuZGVyLm9wZW5hZnMub3JniGMEExECACMFAk95BwQCGwMH
+CwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRD6fAyi+jWGmnRZAKCBC5bGMBQP
+ruWvSHJJ5NarJtMQLACfcG3K0m6VXUnN7XEPtdhZSfUBKFa5AQ0ET3kHBBAEAJbK
+Nf6RcLuABk2h4jqxkOwfpj9E0ZHZpCpD4/x3V7Pg5BTwrIgVj9i8RJ/lWuxhV4pi
+ffRVzfapu4VSk4cb/avRO78SFiaGoa4I5Uy8GwxZxLSKYAQcxPY6sHsj7qs/bagw
+ob72vN9uapxqWsq5qBheUMmulNgvd+eOJsCQL2YrAAMFA/0Tf/3qZm3a9W6X75on
+jJ6wxgyslm9aKZJQ0HLrhDINpJILIyDEIPPtmARcWkLs89rOfQNo2kZhJ7C/kH1D
+9ghtrkqetA5a10znMwn4IHO/+iRJRqv+iBKApXW0GBNNAMfORmmgx+ry+QYm96NK
+iEYD1aoG/s0y1Uf6RJgSGwRNq4hJBBgRAgAJBQJPeQcEAhsMAAoJEPp8DKL6NYaa
+0+IAmwYct4XqR8HCc+mMzlGK9wqHbSezAJ47CyqquFZ52pplHW+05/nCcoBz5A==
+=2lDx
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.0
+
+mQGiBEkmyH4RBAChV6Io3UUlJVlLf9NaQQonTAmOb+WS2smi6YMU0y3WlzkKA15BjDJlaHm1
+xjeJHvWItA2DLQRNxFnESF8SAa80LNoJkjUttmfjNhQUTjsHY7oLaiVvLWclDY2Ve/XI3JUp
+wTfPUgeAFz4CHj2f0anFBQr+RgakvnmOowBAkVP5AwCgzz38ijvF1m1y7YvTn0c/8u+CthcD
+/38NEDlQZyVISFpd6CcouHXh5wyRHIS1gESihqfexh47NBCYy/oXAoPJHen+uZzQo4cQdQli
+dS8Iqinl4/gZDFUCVJ4oBuuvUZgOyxUYkV3+1J4M7ni4xd85mZUM7op/Qhz5scGJ9MtXzMy4
+oI/GXxIK/BZe9BYHZN5FPDycwXi3A/9yyk692c2BfQs+wRPE0zsPveU5Jor+CP0J+Yei/6kO
+n4O03X4JC40y0tQ+uF5o2zX9/XbweLlq7sCwsOr7pdmqEO+yR6prt1OT4uv+6SjTopUEUsQZ
+ZQR4x22/dbfm979bsIb6MJx/0HEcE/CbfEpphX7KtxMahFTHuGM3such07QdT3BlbkFGUyBi
+dWlsZHMgZnJvbSBsb2NocmFuemGIYAQTEQIAIAUCSSbIfwIbAwYLCQgHAwIEFQIIAwQWAgMB
+Ah4BAheAAAoJEBT1az/BnkoKE9cAn3WG8Hmbyjf4/rQ4WGOzxPkqq/CWAJ0ayfLsI4M+GqXD
+qEZzJHbxovtxEw==
+=Mr6F
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/files/openafs-rhel.repo b/files/openafs-rhel.repo
new file mode 100644
index 0000000..c7dd9c7
--- /dev/null
+++ b/files/openafs-rhel.repo
@@ -0,0 +1,12 @@
+[openafs]
+name=OpenAFS 1.6.11 for RHEL $releasever - $basearch
+baseurl=http://dl.openafs.org/dl/openafs/1.6.11/rhel$releasever/$basearch/
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OPENAFS
+gpgcheck=1
+
+[openafs-source]
+name=OpenAFS 1.6.11 for RHEL $releasever - Source
+baseurl=http://dl.openafs.org/dl/openafs/1.6.11/
+enabled=0
+gpgcheck=0
diff --git a/manifests/client.pp b/manifests/client.pp
index 53df2bc..582c969 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -23,32 +23,96 @@ class openafs::client (
     ensure  => present,
   }
 
-  file { '/etc/openafs/afs.conf.client':
+  if ($::osfamily == 'RedHat') {
+    $openafs_path = '/usr/vice/etc'
+
+    $dkms_packages = [
+      'kernel-devel',
+      'dkms',
+      'gcc'
+    ]
+
+    package { $dkms_packages:
+      ensure => present,
+      before => [
+        Package['openafs-client'],
+        Package['openafs-krb5'],
+      ],
+    }
+
+    package { 'dkms-openafs':
+      ensure  => present,
+      require => [
+        Package['kernel-devel'],
+        Package['gcc'],
+        Package['dkms'],
+      ],
+      before  => [
+        Package['openafs-client'],
+        Package['openafs-krb5'],
+      ],
+    }
+
+    file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-OPENAFS':
+      ensure  => present,
+      replace => true,
+      source  => 'puppet:///modules/openafs/RPM-GPG-KEY-OPENAFS',
+      before  => [
+        Package['openafs-client'],
+        Package['openafs-krb5'],
+      ],
+    }
+
+    file { '/etc/yum.repos.d/openafs-rhel.repo':
+      ensure  => present,
+      replace => true,
+      source  => 'puppet:///modules/openafs/openafs-rhel.repo',
+      before  => [
+        Package['openafs-client'],
+        Package['openafs-krb5'],
+      ],
+    }
+
+    file { '/var/cache/openafs':
+      ensure => directory,
+    }
+
+  } else {
+    $openafs_path = '/etc/openafs'
+  }
+
+  file { "${openafs_path}/afs.conf.client":
     ensure  => present,
     replace => true,
     source  => 'puppet:///modules/openafs/afs.conf.client',
     require => Package['openafs-client'],
   }
 
-  file { '/etc/openafs/CellServDB':
+  file { "${openafs_path}/CellServDB":
     ensure  => present,
     replace => true,
     source  => 'puppet:///modules/openafs/CellServDB',
     require => Package['openafs-client'],
   }
 
-  file { '/etc/openafs/ThisCell':
+  file { "${openafs_path}/ThisCell":
     ensure  => present,
     replace => true,
     content => template('openafs/ThisCell.erb'),
     require => Package['openafs-client'],
   }
 
-  file { '/etc/openafs/cacheinfo':
+  file { "${openafs_path}/cacheinfo":
     ensure  => present,
     replace => true,
     content => template('openafs/cacheinfo.erb'),
     require => Package['openafs-client'],
   }
 
+  service { 'openafs-client':
+    ensure    => running,
+    require   => [
+      File["${openafs_path}/CellServDB"],
+    ],
+  }
 }